John Ericson cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging		2018-05-03 16:35:36 -04:00
..
config	treewide: isArm -> isAarch32	2018-04-25 15:28:55 -04:00
hardware	Merge branch 'master' into staging	2018-04-10 09:13:36 +02:00
i18n/input-method	Added cross-references to NixOS manual	2018-04-12 09:39:14 +10:00
installer	Merge pull request #39617 from Mic92/nixos-generate-config	2018-04-28 00:33:21 +02:00
misc	nixos/monetdb: init (#39812)	2018-05-01 16:44:12 +02:00
profiles	Merge pull request #38114 from oxij/nixos/doc-module	2018-04-05 07:09:32 +00:00
programs	Merge pull request #38831 from rdnetto/improve-cross-refs	2018-04-30 21:30:20 -04:00
security	Merge pull request #38831 from rdnetto/improve-cross-refs	2018-04-30 21:30:20 -04:00
services	Merge remote-tracking branch 'upstream/master' into staging	2018-05-03 16:35:36 -04:00
system	Revert "Merge pull request #28206 from edef1c/net-dbus-list-units"	2018-05-02 15:02:29 -05:00
tasks	lxd: 2.16 -> 3.0.0	2018-04-14 11:02:24 +01:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	Merge pull request #39654 from AmineChikhaoui/issue-38623	2018-05-03 17:16:26 +02:00
module-list.nix	nixos/monetdb: init (#39812)	2018-05-01 16:44:12 +02:00
rename.nix	Merge pull request #39048 from oxij/nixos/fix-rename-bugs	2018-04-22 17:46:09 +00:00