nixpkgs/pkgs/games/planetaryannihilation
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
..
default.nix Merge branch 'master' into staging 2015-01-31 19:34:57 +01:00