Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk ... Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091		2012-02-06 23:03:12 +00:00
..
compilers	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
eclipse	update ecj version	2010-11-22 14:50:52 +00:00
guile-modules	Drop 'gnomevfs = gnome_vfs;' alias	2011-10-08 12:06:03 +00:00
interpreters	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
libraries	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +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-06 23:03:12 +00:00
web	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00