Commit Graph

2 Commits

Author SHA1 Message Date
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
Matej Cotman
617d11be2b nodewebkit: add 0.11.2 2015-01-22 05:19:06 +01:00