Robin Gloster e17bc25943 Merge remote-tracking branch 'upstream/master' into staging		2016-08-29 00:24:47 +00:00
..
config	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
hardware	Merge branch 'master' into staging	2016-08-21 12:03:41 +01:00
i18n/input-method	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
installer	nixos-install: remove manifest related stuff	2016-08-24 16:09:30 +01:00
misc	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
profiles
programs	nixos/shadow: setuid wrappers for new{uid,gid}map	2016-08-19 14:59:33 +02:00
security	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
services	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
system	Merge branch 'master' into staging	2016-08-28 13:33:13 +01:00
tasks	nixos/cpu-freq: list correct default governor in description	2016-08-28 17:14:37 -05:00
testing
virtualisation	virtualbox-image: remove raw image (hopefully fixes ova tests)	2016-08-28 11:33:15 +01:00
module-list.nix	ferm: init at 2.3	2016-08-25 21:37:19 +02:00
rename.nix	nixos/modules/rename.nix: fix eval error	2016-08-28 14:47:24 +01:00