Robin Gloster 1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-08-02 13:46:36 +00:00
..
config	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-07-31 20:51:34 +00:00
hardware	nixos ati_unfree: auto-switch xorg to fglrxComat	2016-05-23 10:12:44 +02:00
i18n/input-method	fcitx: refactor (#16858)	2016-07-11 17:50:22 +02:00
installer	nixos-version: fix syntax error and add -h (#16906)	2016-07-13 09:11:32 +02:00
misc	version module: refactor with fileContents	2016-08-01 18:40:36 +09:00
profiles	documentation: fix start display-manager command	2016-07-04 10:25:31 +02:00
programs	tmux module: do not override keys by default in VI mode (#17330)	2016-07-28 13:10:42 +02:00
security	grsecurity module: correct internal note	2016-08-01 16:27:14 +02:00
services	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-08-02 13:46:36 +00:00
system	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-07-31 20:51:34 +00:00
tasks	kbd task: fix colors in early initrd	2016-07-24 15:08:49 +03:00
testing	KDE test: Bump kdm start timeout	2016-05-27 11:22:27 +02:00
virtualisation	declarative containers: additional veths	2016-07-28 23:06:41 +02:00
module-list.nix	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-07-31 20:51:34 +00:00
rename.nix	nixos: rewrite the grsecurity module	2016-06-14 03:38:12 +02:00