Eelco Dolstra 99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/acl/default.nix pkgs/development/libraries/atk/2.6.x.nix pkgs/development/libraries/attr/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/2.34.x.nix pkgs/development/libraries/gtk+/2.24.x.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/openssl/default.nix pkgs/development/libraries/pango/1.30.x.nix pkgs/misc/cups/default.nix pkgs/os-specific/linux/util-linux/default.nix pkgs/servers/x11/xorg/builder.sh pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix		2013-06-09 00:41:27 +02:00
..
arduino	fix ino	2013-03-25 15:28:09 +01:00
compilers	fix eval	2013-06-07 11:18:33 +02:00
eclipse	update ecj to 3.7.2	2012-08-25 19:39:19 +02:00
guile-modules
interpreters	php: Get rid of unnecessary runtime dependencies like gettext	2013-06-04 14:57:37 +02:00
libraries	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-09 00:41:27 +02:00
misc	AVR GCC: enable C++ support (makes it usable with Arduino)	2012-12-23 18:20:34 +02:00
mobile	Override the KitchenSink's appName	2013-05-29 15:17:37 +02:00
ocaml-modules	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
perl-modules	Module::Pluggable: Update to 4.8	2013-06-02 23:33:27 +02:00
python-modules	setuptools: Fix download link (the old one was returning 404)	2013-05-31 01:09:44 +00:00
qtcreator	qtcreator: Update to 2.7.1 and improvements (merge #579)	2013-06-01 12:53:17 +02:00
ruby-modules	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
tools	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-09 00:41:27 +02:00
web	fix node packages with binary (native) extensions	2013-06-06 22:38:24 +02:00