Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv ... Conflicts: pkgs/stdenv/generic/default.nix		2014-08-22 00:07:05 +02:00
..
arduino
compilers	Merge branch 'master' into staging	2014-08-14 23:09:59 +02:00
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
libraries	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
lisp-modules
misc
mobile
ocaml-modules	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
perl-modules
pharo/vm
python-modules	Merge #3152: add pyqt5	2014-08-12 20:33:34 +02:00
qtcreator
r-modules
ruby-modules
tools	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
web	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00