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
..
androidenv	rename occurrences of cc.gcc to cc.cc	2015-01-14 20:51:58 -08:00
flashtool	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
titaniumenv	titaniumenv: Fix unpack step and change default iOS SDK to 8.1	2015-01-23 15:57:34 +00:00
xcodeenv	xcodeenv: make version 6.1.1 the default	2015-01-22 15:36:58 +00:00
xpwn