Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk ... Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863		2012-01-26 15:27:03 +00:00
..
compilers	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
eclipse
guile-modules	Drop 'gnomevfs = gnome_vfs;' alias	2011-10-08 12:06:03 +00:00
interpreters	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
libraries	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +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-01-26 15:27:03 +00:00
web	svn merge ^/nixpkgs/trunk, one simple conflict in jruby	2012-01-19 21:31:51 +00:00