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
..
applications	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
build-support	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
data	zeal: new package	2015-01-28 00:02:50 +01:00
desktops	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
development	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
games	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
misc	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
os-specific	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
servers	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
shells	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
stdenv	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
top-level	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00