nixpkgs/pkgs/development/libraries/gtk+
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
..
2.x.nix Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-08-21 17:05:30 +02:00
3.x.nix pango, gtk3: non-Linux attempts to fix 2013-06-19 09:00:06 +02:00