Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
arduino
compilers	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
eclipse
guile-modules
interpreters	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
libraries	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
misc
mobile
ocaml-modules
perl-modules
python-modules
qtcreator
ruby-modules
tools	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
web