Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix		2013-04-24 06:29:09 +00:00
..
arduino
compilers	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
eclipse
guile-modules
interpreters	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
libraries	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
misc
mobile	titaniumsdk: Updated KitchenSink example + fix native libraries	2013-04-17 13:52:42 +02:00
ocaml-modules
perl-modules
python-modules
qtcreator
ruby-modules
tools	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
web	plone: adding version 4.2.5 and 4.1.6	2013-04-17 02:28:45 +02:00