Eelco Dolstra 552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/atk/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/gmime/default.nix pkgs/development/libraries/pango/default.nix pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix		2013-06-25 18:42:56 +02:00
..
arduino
compilers	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-25 18:42:56 +02:00
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-25 18:42:56 +02:00
libraries	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-25 18:42:56 +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	Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by	2013-06-22 09:45:01 +03:00
qtcreator	qtcreator: Update to 2.7.1 and improvements (merge #579)	2013-06-01 12:53:17 +02:00
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-25 18:42:56 +02:00
web	Plone: fix for 4.1	2013-06-10 20:59:58 +02:00