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
i18n/input-method
installer	nixos/iso-image: support boot from USB disks	2017-03-09 15:35:30 +02:00
misc
profiles
programs
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
testing
virtualisation	virtualisation-xen: fix defaultText interpolation	2017-03-11 00:09:22 +01:00
module-list.nix
rename.nix	nixos/dnscrypt-proxy: inline option renamings	2017-03-10 18:54:51 +01:00