Parnell Springmeyer c30cf645f8 Make setting of the wrapper macros a compile-time error		2017-01-26 02:06:24 -08:00
..
config	Merging against master - updating smokingpig, rebase was going to be messy	2017-01-26 02:00:04 -08:00
hardware	Merge pull request #21995 from abbradar/opencl	2017-01-20 12:09:17 +03:00
i18n/input-method	nixos/ibus: fix custom panel example	2017-01-24 12:52:39 -06:00
installer	Merging against master - updating smokingpig, rebase was going to be messy	2017-01-26 02:00:04 -08:00
misc	add kresd service with basic options	2017-01-25 18:46:28 +01:00
profiles	install-device: correct command to start sshd	2017-01-25 21:09:31 +01:00
programs	Merging against master - updating smokingpig, rebase was going to be messy	2017-01-26 02:00:04 -08:00
security	Make setting of the wrapper macros a compile-time error	2017-01-26 02:06:24 -08:00
services	Merging against master - updating smokingpig, rebase was going to be messy	2017-01-26 02:00:04 -08:00
system	Merging against master - updating smokingpig, rebase was going to be messy	2017-01-26 02:00:04 -08:00
tasks	More fixing	2017-01-26 01:00:46 -08:00
testing	virtualisation.qemu.program: Remove	2016-12-20 10:52:46 +01:00
virtualisation	Merging against master - updating smokingpig, rebase was going to be messy	2017-01-26 02:00:04 -08:00
module-list.nix	Merging against master - updating smokingpig, rebase was going to be messy	2017-01-26 02:00:04 -08:00
rename.nix	Merging against master - updating smokingpig, rebase was going to be messy	2017-01-26 02:00:04 -08:00