Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk ... - 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500		2012-03-31 20:01:40 +00:00
doc	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
maintainers	svn path=/nixpkgs/trunk/; revision=32961	2012-03-09 17:53:04 +00:00
pkgs	svn merge ^/nixpkgs/trunk	2012-03-31 20:01:40 +00: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
STABLE	* Move stuff.	2005-02-21 16:05:33 +00:00
VERSION	* Bump the version.	2010-02-08 09:23:03 +00:00