Files
nixpkgs/pkgs/tools
Vladimír Čunát 4495d06a7f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/top-level/all-packages.nix
2015-02-04 22:00:07 +01:00
..
2015-01-19 18:41:17 +01:00
2014-11-15 22:32:47 +01:00
2014-11-07 11:17:48 +02:00
2015-02-04 22:00:07 +01:00
2015-01-29 00:19:57 +01:00
2015-01-26 12:05:37 +01:00