Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ... In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix		2014-09-08 18:16:54 +02:00
..
arduino
compilers	Merge branch 'master' into staging	2014-08-14 23:09:59 +02:00
eclipse
guile-modules
interpreters	merge 'staging' into modular-stdenv	2014-09-08 18:16:54 +02:00
libraries	merge 'staging' into modular-stdenv	2014-09-08 18:16:54 +02:00
lisp-modules
misc
mobile
ocaml-modules	merge 'staging' into modular-stdenv	2014-09-08 18:16:54 +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 'staging' into modular-stdenv	2014-09-08 18:16:54 +02:00
web	merge 'staging' into modular-stdenv	2014-09-08 18:16:54 +02:00