Merge branch 'master' into staging

Browse Source

Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix

...

This commit is contained in:

Vladimír Čunát

2015-01-31 19:34:57 +01:00

parent 5dab625862 b50cabf2d4

commit dbae4f109f

564 changed files with 41839 additions and 27779 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

pkgs/games/planetaryannihilation/default.nix

Executable → Regular