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	update ecj to 3.7.2	2012-08-25 19:39:19 +02:00
guile-modules	Drop 'gnomevfs = gnome_vfs;' alias	2011-10-08 12:06:03 +00:00
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	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
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	Gajim: make OpenSSL code work	2012-09-13 18:03:50 +04:00
qtcreator	Add qtcreator-2.5.2	2012-10-16 18:03:13 +02:00
ruby-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
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