Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk ... A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434		2012-01-08 16:01:12 +00:00
..
analysis	LCOV: Add `meta.platforms'.	2011-12-06 14:12:43 +00:00
build-managers	Add a warning to cmake/default.nix	2012-01-03 18:00:02 +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-cabal2nix: updated to version 1.23	2011-12-25 16:18:34 +00:00
java
literate-programming/noweb
misc	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
ocaml	Update ocaml-findlib to version 1.2.7	2011-12-16 09:22:31 +00:00
parsing	* Sync with the trunk.	2011-12-12 16:54:35 +00:00
profiling
selenium/remote-control