Robin Gloster 4036e9ba8c Merge branch 'up' into hardened-stdenv		2016-02-20 22:27:33 +00:00
..
config	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-02-19 21:16:14 +00:00
hardware	Merge branch 'master' into staging	2016-02-17 10:06:31 +01:00
installer	Merge branch 'master' into staging	2016-02-17 10:06:31 +01:00
misc	octoprint service: init	2016-02-17 17:05:59 +03:00
profiles	wpa_supplicant service: jobs -> systemd.services	2016-01-06 03:58:39 +00:00
programs	Merge branch 'master' into staging	2016-02-07 13:52:42 +01:00
security	Merge branch 'master' into staging	2016-02-17 10:06:31 +01:00
services	Merge branch 'up' into hardened-stdenv	2016-02-20 22:27:33 +00:00
system	Revert "Remove double-backslashes from grub conf file".	2016-02-12 13:14:34 +01:00
tasks	Fix typo	2016-02-12 14:35:40 +01:00
testing	NixOS tests: Increase hung_task_timeout_secs	2016-01-04 16:53:42 +01:00
virtualisation	Fix azure image, by adding subformat=fixed to disk generation.	2016-02-17 12:02:52 +00:00
module-list.nix	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-02-19 21:16:14 +00:00
rename.nix	nixos xserver: remove vaapiDrivers	2016-01-26 13:42:40 +03:00