Vladimír Čunát dbae4f109f Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-01-31 19:34:57 +01: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	Fix #4019	2014-09-10 23:17:26 -04:00