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
..
darwin	Merge pull request #723 from lovek323/darwin-tools	2013-07-07 04:49:04 -07:00
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
windows	pthread-win32: don't propagate `mingw_headers'	2013-03-29 21:46:38 +01:00