Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
androidenv	androidenv: Remove examples directory	2012-11-20 11:29:04 +01:00
compilers	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
eclipse
guile-modules
interpreters	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
libraries	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
misc
ocaml-modules	Update ocamlnet to version 3.6. (Does not compile under 4.00.0 though.)	2012-10-09 14:03:12 -04:00
perl-modules	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
python-modules
qtcreator	Add qtcreator-2.5.2	2012-10-16 18:03:13 +02:00
ruby-modules
tools	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
web	node.js: upgrade to v0.8.12	2012-10-27 13:06:53 +02:00