Nikolay Amiantov d8fb60d1d4 Merge pull request #23014 from zraexy/zraexy-bumblebee-pmmethod ... bumblebee service: Fix pmMethod bbswitch check		2017-02-20 16:18:45 +03:00
..
config	Merging with upstream	2017-01-29 05:54:01 -06:00
hardware	bumblebee service: Fix pmMethod bbswitch check	2017-02-19 22:46:47 -09:00
i18n/input-method	nixos/ibus: fix custom panel example	2017-01-24 12:52:39 -06:00
installer	fix comments about nixos-hardware-scan	2017-02-18 13:29:47 +01:00
misc	programs.wireshark: use setcap wrapper	2017-02-17 15:42:55 +01:00
profiles	nixos: update default cases from KDM/KDE4 to SDDM/KDE5	2017-02-09 21:52:00 -05:00
programs	Merge pull request #22882 from bjornfor/wireshark	2017-02-20 14:03:30 +01:00
security	Merge pull request #22882 from bjornfor/wireshark	2017-02-20 14:03:30 +01:00
services	munin service: listen on IPv6 loopback as well (#23012)	2017-02-20 06:13:48 +01:00
system	Merge pull request #22969 from symphorien/extrainitrd	2017-02-20 04:32:48 +01:00
tasks	network-interfaces service: fix typo in bonding options	2017-02-18 15:51:52 +01:00
testing	kdm: drop service	2017-02-11 13:55:09 -05:00
virtualisation	Add ca-central-1 AMIs	2017-02-19 23:46:08 +01:00
module-list.nix	Merge pull request #22882 from bjornfor/wireshark	2017-02-20 14:03:30 +01:00
rename.nix	nixos: hint about security.setuidOwners/Programs -> security.wrappers	2017-02-15 07:25:33 +01:00