Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/icu/default.nix pkgs/tools/misc/coreutils/default.nix		2013-04-19 11:48:11 +02:00
..
arduino
compilers	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
eclipse
guile-modules
interpreters	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
libraries	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +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 changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
web	plone: adding version 4.2.5 and 4.1.6	2013-04-17 02:28:45 +02:00