Parnell Springmeyer bae00e8aa8 setcap-wrapper: Merging with upstream master and resolving conflicts		2017-01-25 11:08:05 -08:00
..
config	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
hardware	bumblebee service: replace bbswitch option with pmMethod	2016-11-22 02:35:12 +03:00
i18n/input-method
installer	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
misc	update os-release manpage link	2017-01-07 19:57:03 +02:00
profiles	nixos installer: don't log refused packets to console	2017-01-09 19:24:41 +01:00
programs	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
security	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
services	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
system	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
tasks	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
testing	virtualisation.qemu.program: Remove	2016-12-20 10:52:46 +01:00
virtualisation	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
module-list.nix	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00
rename.nix	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00