Benjamin Staffin f06c5d5757 Merge pull request #14728 from Baughn/patch-4 ... zfs: Update devNodes description		2016-04-16 16:07:50 -07:00
..
config	Merge branch 'master' into closure-size	2016-04-10 11:17:52 +02:00
hardware	opengl.extraPackages32: pkgsi686Linux in example	2016-03-26 00:50:56 +11:00
i18n/input-method	input-method module: fix folder case	2016-04-12 19:50:26 +09:00
installer	Merge branch 'staging', containing closure-size #7701	2016-04-13 09:25:28 +02:00
misc	factorio: headless server module	2016-04-14 23:03:36 -07:00
profiles	Merge 'staging' into closure-size	2016-04-07 14:40:51 +02:00
programs	Merge branch 'master' into closure-size	2016-04-10 11:17:52 +02:00
security	Merge branch 'staging', containing closure-size #7701	2016-04-13 09:25:28 +02:00
services	cups service: use cups.out everywhere	2016-04-16 21:26:33 +02:00
system	stage-1: Remove doublePatchelf hack	2016-04-15 01:53:34 +03:00
tasks	zfs: Update devNodes description	2016-04-15 17:25:32 +01:00
testing
virtualisation	replace makeSearchPath tree-wise to take care of possible multiple outputs	2016-04-13 22:09:41 +03:00
module-list.nix	factorio: headless server module	2016-04-14 23:03:36 -07:00
rename.nix	nixos: fix incorrect rename for input-methods options	2016-04-13 02:32:53 +02:00