Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. ... Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix		2013-07-30 11:29:30 +02:00
..
arduino
compilers	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
libraries	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
misc
mobile
ocaml-modules
perl-modules
python-modules	don't wrap scripts in EGG-INFO/scripts since they are called from python	2013-07-29 19:31:58 +02:00
qtcreator
ruby-modules
tools	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
web	buildNodePackage: Fix $out/bin symlink	2013-07-28 11:46:40 -04:00