Vladimír Čunát 5979d428b4 Merge recent master into x-updates ... Hydra: ?compare=1134869 Conflicts (just meta): pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix		2014-07-09 22:13:29 +02:00
..
audio	Merge master into x-updates	2014-07-02 22:54:41 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	Merge pull request #3163 from pSub/writegood-mode	2014-07-02 14:15:10 +02:00
graphics	qt3, graphicsmagick137, fox, neverball: fix build	2014-07-09 21:52:04 +02:00
ike	ike: use stdenv.lib.licenses.sleepycat	2014-03-24 19:58:36 -05:00
inferno	Add inferno, a distributed cross-platform hosted OS	2014-07-02 14:00:49 +12:00
misc	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
networking	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
office	Do not create unneeded local-scope packages; disable a failing test	2014-06-28 23:33:42 +04:00
science	Update boinc	2014-07-04 22:18:49 +04:00
search
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	vcprompt: new package	2014-07-02 02:43:47 -04:00
video	cinelerra: don't repeat package name in meta.description	2014-06-22 22:49:32 +02:00
virtualization	qemu: 1.7.1 -> 2.0.0	2014-05-18 15:52:44 -05:00
window-managers	Merge master into x-updates	2014-07-02 22:54:41 +02:00