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
..
audio	Merge branch 'master' into staging	2015-02-04 22:00:07 +01:00
backup/crashplan	crashplan: install desktop file	2014-12-19 23:26:35 +01:00
display-managers	fix sha for a slim's theme	2014-11-08 22:40:36 +03:00
editors	fix evaluation	2015-02-03 14:31:07 -08:00
gis	qgis: update from 2.4.0 to 2.6.1	2015-01-19 16:18:01 +01:00
graphics	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
inferno	rename <gcc-frontend>.gcc to <gcc-frontend>.cc	2015-01-14 20:59:10 -08:00
kde-apps-14.12	kdeApps.kmix: remove Qt 4 dependencies	2015-02-01 10:26:55 -06:00
misc	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
networking	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
office	mendeley: gcc.gcc -> gcc.cc (fix evaluation)	2015-02-04 07:16:19 +01:00
science	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
version-management	version-management/gitolite: Bump version 3.6.1 -> 3.6.2	2015-01-29 23:45:50 +11:00
video	Merge pull request #6090 from richardlarocque/xbmc_rtmp	2015-02-03 23:22:52 +01:00
virtualization	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
window-managers	Merge pull request #5025 from abbradar/xmonad-wrapper	2015-02-03 11:52:09 +01:00