Peter Simons 6694ef42a9 Merge branch 'master' into staging. ... Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/tools/security/gnupg/21.nix pkgs/top-level/all-packages.nix		2015-03-10 12:09:43 +01:00
..
darwin	Flip cctools and cctools cross	2015-02-18 00:24:33 -05:00
gnu	gnu: Fix (evaluation of the) call to forceSystem.	2014-07-28 20:46:32 +02:00
linux	Merge branch 'master' into staging.	2015-03-10 12:09:43 +01:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00