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
perl-modules	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
python-modules
qtcreator
ruby-modules
tools	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
web