Vladimír Čunát 77da5efc78 merge the rest of multiple-outputs ... Conflicts: pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken) pkgs/development/tools/misc/patchelf/default.nix (easy) pkgs/stdenv/generic/setup.sh (previous merge taken)		2014-08-25 10:41:49 +02:00
..
arduino
compilers	merge the rest of multiple-outputs	2014-08-25 10:41:49 +02:00
eclipse
guile-modules
interpreters	merge the rest of multiple-outputs	2014-08-25 10:41:49 +02:00
libraries	merge the rest of multiple-outputs	2014-08-25 10:41:49 +02:00
lisp-modules	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
misc	intelgen4asm: Remove obsolete package	2014-08-07 01:32:43 +02:00
mobile
ocaml-modules	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
perl-modules	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
pharo/vm	Adding myself to the maintainers	2014-08-10 15:57:24 +02:00
python-modules	Merge #3152: add pyqt5	2014-08-12 20:33:34 +02:00
qtcreator
r-modules	RcmdrPlugin_ROC: remove broken package	2014-08-15 18:51:47 +02:00
ruby-modules
tools	merge the rest of multiple-outputs	2014-08-25 10:41:49 +02:00
web	merge the rest of multiple-outputs	2014-08-25 10:41:49 +02:00