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
..
1.0.0-alpha.nix	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
common.nix
grsec.HEAD.patch
grsec.patch	rustc: Update from 0.12 -> 1.0.0-alpha	2015-01-20 22:19:16 +01:00
hardcode_paths.HEAD.patch	rustcMaster: Update from 0.13-dev-g6539cb4 -> 1.0.0-dev-ga833337	2015-01-20 22:19:17 +01:00
hardcode_paths.patch	rustc: Update from 0.12 -> 1.0.0-alpha	2015-01-20 22:19:16 +01:00
head.nix	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
local_stage0.HEAD.patch
local_stage0.patch