Vladimír Čunát 09af15654f Merge master into closure-size ... The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.		2016-03-08 09:58:19 +01:00
..
config	Merge master into closure-size	2016-03-08 09:58:19 +01:00
hardware	Merge branch 'master' into staging	2016-02-17 10:06:31 +01:00
i18n/inputMethod	fcitx: show available engines in module description	2016-02-28 07:12:55 -06:00
installer	Merge master into closure-size	2016-03-08 09:58:19 +01:00
misc	Merge pull request #13591 from mayflower/services/nntp-proxy	2016-03-03 18:57:25 +01:00
profiles	Merge master into closure-size	2016-03-08 09:58:19 +01:00
programs	Merge master into closure-size	2016-03-08 09:58:19 +01:00
security	Merge master into closure-size	2016-03-08 09:58:19 +01:00
services	Merge master into closure-size	2016-03-08 09:58:19 +01:00
system	Merge master into closure-size	2016-03-08 09:58:19 +01:00
tasks	Merge branch 'master' into closure-size	2016-02-14 08:33:51 +01:00
testing	test-instrumentation.nix: Only clear $PAGER in the backdoor shell	2016-02-23 11:56:09 +01:00
virtualisation	Merge master into closure-size	2016-03-08 09:58:19 +01:00
module-list.nix	spice-vdagentd service : initial at 0.16.0	2016-03-05 07:56:47 +10:00
rename.nix	gitlab: 8.0.5 -> 8.5.0, service improvements	2016-02-26 07:08:31 +01:00