John Ericson 63bf5f3ba3 Merge pull request #21189 from Ericson2314/mea-culpa ... Mea culpa. Tests should pass now		2016-12-15 17:59:24 -05:00
..
applications	discord: Fix missing desktop entry (closes #21045)	2016-12-15 23:52:50 +01:00
build-support	Merge pull request #19369 from Mic92/nix-prefetch-git	2016-12-14 08:32:50 +01:00
data	unscii: init at 1.1	2016-12-15 21:29:13 +01:00
desktops	lxqt: better organize system packages	2016-12-15 22:45:06 +01:00
development	go: 1.7.3 -> 1.7.4	2016-12-15 17:17:58 -05:00
games	endless sky: init at 0.9.4	2016-12-11 08:57:35 +01:00
misc	Add vim-markdown plugin....	2016-12-14 17:29:52 -06:00
os-specific	kexec-tools: 2.0.12 -> 2.0.13 (#21158)	2016-12-15 20:48:03 +01:00
servers	zabbix22: 2.2.2 -> 2.2.16 for CVE-2016-4338 CVE-2016-9140	2016-12-15 17:17:58 -05:00
shells	zsh: 5.2 -> 5.3	2016-12-12 17:48:18 -05:00
stdenv	top-level: avoid another assert false while we're at it	2016-12-15 17:09:46 -05:00
test
tools	unzip: patch for CVE-2014-9913 and CVE-2016-9844	2016-12-15 17:17:58 -05:00
top-level	Merge pull request #21189 from Ericson2314/mea-culpa	2016-12-15 17:59:24 -05:00