Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ... Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix		2013-05-04 18:28:48 -04:00
..
arduino	fix ino	2013-03-25 15:28:09 +01:00
compilers	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
eclipse
guile-modules
interpreters	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
libraries	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04: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	dbus-python: update the ancient version	2013-03-15 01:09:57 +01:00
qtcreator
ruby-modules
tools	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
web	plone: adding version 4.2.5 and 4.1.6	2013-04-17 02:28:45 +02:00