Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates. ... There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though.		2013-06-11 12:11:25 +02:00
..
arduino
compilers	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
eclipse
guile-modules
interpreters	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
libraries	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
misc
mobile	Override the KitchenSink's appName	2013-05-29 15:17:37 +02:00
ocaml-modules
perl-modules	Module::Pluggable: Update to 4.8	2013-06-02 23:33:27 +02:00
python-modules	pygame: update to 1.9.1	2013-06-09 12:12:15 +08:00
qtcreator	qtcreator: Update to 2.7.1 and improvements (merge #579)	2013-06-01 12:53:17 +02:00
ruby-modules
tools	Merge branch 'master' into stdenv-updates.	2013-06-11 12:11:25 +02:00
web	Plone: fix for 4.1	2013-06-10 20:59:58 +02:00