Files
nixpkgs/pkgs/misc
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
..
2014-11-18 20:36:46 +01:00
2014-10-25 17:24:47 +02:00
2015-02-01 10:07:01 -08:00
2015-01-26 20:59:51 -06:00
2014-12-18 02:41:47 +03:00
2014-11-09 22:16:58 +00:00