Vladimír Čunát 4495d06a7f Merge branch 'master' into staging ... Conflicts (simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/top-level/all-packages.nix		2015-02-04 22:00:07 +01:00
..
darwin	darwin-specific stuff	2015-02-03 14:06:13 -08: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-02-04 22:00:07 +01:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00