Vladimír Čunát ec736312d4 Merge branch 'master' into x-updates ... Conflicts: pkgs/development/compilers/vala/default.nix (it's different version) pkgs/development/libraries/cairo/default.nix (trivial)		2013-04-17 18:26:28 +02:00
..
arduino
compilers	some libintl and libiconv cleanups + non-linux fixes	2013-04-14 13:43:09 +02:00
eclipse
guile-modules
interpreters	Merge branch 'master' into x-updates	2013-04-17 18:26:28 +02:00
libraries	Merge branch 'master' into x-updates	2013-04-17 18:26:28 +02:00
misc
mobile	titaniumsdk: Updated KitchenSink example + fix native libraries	2013-04-17 13:52:42 +02:00
ocaml-modules
perl-modules	DBD-SQLite: Update to 1.37	2013-04-11 13:16:59 -04:00
python-modules
qtcreator
ruby-modules
tools	Merge branch 'master' into x-updates	2013-04-17 18:26:28 +02:00
web	plone: adding version 4.2.5 and 4.1.6	2013-04-17 02:28:45 +02:00