Franz Pletz b4cc9bd63a Merge remote-tracking branch 'origin/master' into hardened-stdenv ... Fixes #17801 and #17802.		2016-08-17 19:43:43 +02:00
..
config	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
hardware	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
i18n/input-method	fcitx-unikey: mention in dockbook	2016-08-12 14:36:36 +07:00
installer	nixos/lib/make-disk-image: refactor to use nixos-install	2016-08-16 15:31:16 +01:00
misc	mattermost service: init	2016-08-15 04:15:11 +02:00
profiles	documentation: fix start display-manager command	2016-07-04 10:25:31 +02:00
programs	unity3d: use chromium-suid-sandbox	2016-08-08 10:49:00 +03:00
security	grsecurity module: systemd-nspawn requires cap_sys_admin	2016-08-15 20:36:47 +02:00
services	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-17 19:43:43 +02:00
system	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-17 19:43:43 +02:00
tasks	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
testing	KDE test: Bump kdm start timeout	2016-05-27 11:22:27 +02:00
virtualisation	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
module-list.nix	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-17 19:43:43 +02:00
rename.nix	unity3d: use chromium-suid-sandbox	2016-08-08 10:49:00 +03:00