Vladimír Čunát 694fa543af Merge 'staging' ... Conflicts: pkgs/servers/x11/xorg/default.nix		2014-08-24 10:50:22 +02:00
..
arduino
compilers	orc: disable tests on i686	2014-08-23 15:17:06 +02:00
eclipse
guile-modules
interpreters	Merge 'staging'	2014-08-24 10:50:22 +02:00
libraries	Merge 'staging'	2014-08-24 10:50:22 +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
qtcreator
r-modules
ruby-modules
tools	Merge 'staging'	2014-08-24 10:50:22 +02:00
web	Merge 'staging'	2014-08-24 10:50:22 +02:00