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
..
applications	Merge branch 'master' into staging	2015-02-04 22:00:07 +01:00
build-support	solr: 4.10.2 -> 4.10.3, CVE-2014-3628	2015-02-04 11:48:28 +01:00
data	zeal: new package	2015-01-28 00:02:50 +01:00
desktops	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
development	Merge branch 'master' into staging	2015-02-04 22:00:07 +01:00
games	Merge pull request #6097 from waylon531/patch-1	2015-02-03 19:22:44 +08:00
misc	vim-plugins: add xkb-switch	2015-02-04 00:17:08 +03:00
os-specific	Merge branch 'master' into staging	2015-02-04 22:00:07 +01:00
servers	More download mirrors for samba URLs	2015-02-04 17:38:39 +01:00
shells	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
stdenv	move libcxx[abi] into llvm tree	2015-02-03 14:58:10 -08:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge branch 'master' into staging	2015-02-04 22:00:07 +01:00
top-level	avxsynth: fix build by using libjpeg_original	2015-02-04 21:45:00 +01:00