Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/libraries/qt-5/5.7/qtbase/default.nix		2017-03-14 00:49:22 +02:00
..
config	Merge pull request #23503 from ttuegel/fontconfig	2017-03-09 19:29:28 -06:00
hardware	microcode updates: prepend first in initrd	2017-02-27 17:12:33 +01:00
i18n/input-method	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	nixos/iso-image: support boot from USB disks	2017-03-09 15:35:30 +02:00
misc	fcron: 3.1.2 -> 3.2.1	2017-03-05 22:41:11 +01:00
profiles	nixos: fix renaming warning in graphical profile	2017-03-03 07:27:41 -06:00
programs	Merge pull request #22882 from bjornfor/wireshark	2017-02-20 14:03:30 +01:00
security	gresecurity docs: fix incorrect option (#23789)	2017-03-12 15:05:14 +01:00
services	Merge remote-tracking branch 'upstream/master' into staging	2017-03-14 00:49:22 +02:00
system	ykpers: consolidate into yubikey-personalization	2017-03-11 16:23:00 -05:00
tasks	networking/bonds: fix examples	2017-03-08 04:54:17 +01:00
testing	kdm: drop service	2017-02-11 13:55:09 -05:00
virtualisation	virtualisation-xen: fix defaultText interpolation	2017-03-11 00:09:22 +01:00
module-list.nix	Merge pull request #20904 from offlinehacker/nixos/xserver/xpra	2017-03-05 01:32:23 +01:00
rename.nix	nixos/dnscrypt-proxy: inline option renamings	2017-03-10 18:54:51 +01:00