Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libsndfile/default.nix pkgs/misc/cups/default.nix pkgs/top-level/all-packages.nix		2013-08-21 17:05:30 +02:00
..
applications	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
build-support	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
data	unmaintain several packages	2013-08-16 23:45:01 +02:00
desktops	Merge pull request #797 from qknight/smokegen-patch-fix	2013-08-21 00:51:31 -07:00
development	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
games	instead: version 1.9.1, icon, .desktop, few more games	2013-08-18 19:34:23 +02:00
lib	Cleaned up ponysay build, and added maintainer metadata.	2013-08-18 18:23:35 +02:00
misc	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
os-specific	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
servers	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
shells	unmaintain several packages	2013-08-16 23:45:01 +02:00
stdenv	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-25 18:42:56 +02:00
test
tools	gnupg: update to version 2.0.21	2013-08-21 15:08:05 +02:00
top-level	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00