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
build-managers
cdecl
documentation
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
parsing	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
profiling
selenium/remote-control