Parnell Springmeyer 9e36a58649 Merging against upstream master		2017-02-13 17:16:28 -06:00
..
config	Merging with upstream	2017-01-29 05:54:01 -06:00
hardware	linuxPackages.nvidia_x11: refactor, build more from source	2017-02-08 16:57:46 +03:00
i18n/input-method	nixos/ibus: fix custom panel example	2017-01-24 12:52:39 -06:00
installer	Merging against upstream master	2017-02-13 17:16:28 -06:00
misc	Merging against upstream master	2017-02-13 17:16:28 -06:00
profiles	nixos: update default cases from KDM/KDE4 to SDDM/KDE5	2017-02-09 21:52:00 -05:00
programs	Set merge + mkIf always surprises me	2017-01-29 17:10:32 -06:00
security	Merging against upstream master	2017-02-13 17:16:28 -06:00
services	Merging against upstream master	2017-02-13 17:16:28 -06:00
system	grub: fix capitalisation	2017-02-13 14:55:36 +01:00
tasks	Merging against upstream master	2017-02-13 17:16:28 -06:00
testing	kdm: drop service	2017-02-11 13:55:09 -05:00
virtualisation	Merging against upstream master	2017-02-13 17:16:28 -06:00
module-list.nix	Merging against upstream master	2017-02-13 17:16:28 -06:00
rename.nix	Merging against upstream master	2017-02-13 17:16:28 -06:00