Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates ... mountall conflict was trivial Conflicts: pkgs/os-specific/linux/mountall/default.nix		2012-07-14 14:24:27 -04:00
doc	Fix duplicate ID	2012-06-25 11:24:05 -04:00
maintainers	svn path=/nixpkgs/trunk/; revision=32961	2012-03-09 17:53:04 +00:00
pkgs	Merge remote-tracking branch 'upstream/master' into x-updates	2012-07-14 14:24:27 -04:00
.gitignore	add `.gitignore'	2012-07-07 13:56:29 +02:00
COPYING	* Applying an MIT-style license to Nixpkgs.	2006-04-25 16:50:34 +00:00
default.nix	* For convenience, provide a top-level Nix expression that simply	2007-04-26 14:32:57 +00:00
VERSION	* Bump version number.	2012-06-04 03:53:25 +00:00