Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-08-16 07:54:01 +00: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: remove rsync from base install and add explicit path in nixos-install	2016-08-09 21:39:40 +01:00
misc	nixos/version: Try to get Git revison from .git	2016-08-09 14:18:20 +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 'upstream/master' into hardened-stdenv	2016-08-16 07:54:01 +00:00
system	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04: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 branch 'master' into hardened-stdenv	2016-08-13 16:59:55 +02:00
rename.nix	unity3d: use chromium-suid-sandbox	2016-08-08 10:49:00 +03:00