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
..
build_winetricks.sh
stable.nix	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
stable.upstream
unstable.nix	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
unstable.upstream	Update unstable Wine	2014-08-31 18:20:06 +04:00
winetricks.nix
winetricks.patch