Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk ... There were a few merge conflicts due to ensureDir->mkdir -p migration svn path=/nixpkgs/branches/stdenv-updates/; revision=32174		2012-02-10 10:24:30 +00:00
..
compilers	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
eclipse
guile-modules	Drop 'gnomevfs = gnome_vfs;' alias	2011-10-08 12:06:03 +00:00
interpreters	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00
libraries	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00
misc	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
ocaml-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
perl-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
python-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
ruby-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
tools	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00
web	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00