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
..
analysis	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
build-managers	* Don't replace /opt if it's followed by something other than	2012-01-23 13:16:51 +00:00
cdecl
documentation	State qt version (3/4) in packages, not in all-packages.nix	2012-01-07 17:06:49 +00:00
guile
haskell	haskell-hlint: updated to version 1.8.21	2012-01-26 14:20:27 +00:00
java
literate-programming/noweb
misc	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
ocaml	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
parsing	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
profiling
selenium/remote-control	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00