Vladimír Čunát 9b02635faa Merge recent master into x-updates ... Hydra: ?compare=1138350 Conflicts: nixos/modules/services/x11/desktop-managers/default.nix Two imports were added independently on the same line. I split it as well, as it was very long now.		2014-07-21 12:05:57 +02:00
..
arduino
compilers	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
eclipse
guile-modules
interpreters	Merge recent master into x-updates	2014-07-17 19:30:56 +02:00
libraries	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
lisp-modules
misc
mobile	titaniumsdk: Bump to version 3.3.0.GA stable	2014-07-18 16:59:36 +02:00
ocaml-modules
perl-modules
python-modules
qtcreator
r-modules
ruby-modules
tools	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
web