Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates ... Conflicts (relatively simple): pkgs/development/interpreters/python/2.7/default.nix pkgs/development/libraries/dbus/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/common.nix		2013-06-20 19:21:25 +02:00
..
arduino
compilers	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
eclipse
guile-modules
interpreters	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
libraries	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
misc	amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully	2013-06-20 02:22:18 +00:00
mobile	titaniumsdk: Bump to version 3.1.1	2013-06-13 13:58:32 +02:00
ocaml-modules	camlimages ... still wasn't ok. Now better.	2013-06-19 04:39:55 +02:00
perl-modules	Module::Pluggable: Update to 4.8	2013-06-02 23:33:27 +02:00
python-modules	pygtk: propagate gtk (fixes solfege build)	2013-06-13 13:02:24 +02: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-20 19:21:25 +02:00
web	Plone: fix for 4.1	2013-06-10 20:59:58 +02:00