William A. Kennington III 9d6555dc0a Merge branch 'master.upstream' into staging.upstream		2015-06-06 12:04:42 -07:00
..
config	pulseaudio: Revert to regular style	2015-06-04 14:54:54 +02:00
hardware	nvidia: 346.47 -> 346.59	2015-04-07 13:24:55 -07:00
installer	Don't include 4 editors in the minimal installation CD	2015-06-04 11:06:44 +02:00
misc	Merge pull request #7857 from rushmorem/marathon-module-update	2015-05-21 16:52:14 +03:00
profiles	Don't include 4 editors in the minimal installation CD	2015-06-04 11:06:44 +02:00
programs	openssl: Remove References to OPENSSL_X509_CERT_FILE	2015-05-31 15:50:51 -07:00
security	Merge branch 'master.upstream' into staging.upstream	2015-06-06 12:04:42 -07:00
services	Merge pull request #8127 from ip1981/mwlib	2015-06-03 12:50:02 +02:00
system	Add option ‘system.extraDependencies’ for including stuff in the system closure	2015-06-04 11:06:44 +02:00
tasks	nixos: add support for exfat filesystem	2015-05-27 18:59:33 +03:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	Merge pull request #6732 from oconnorr/master	2015-06-02 20:34:43 +02:00
module-list.nix	nixos: add support for exfat filesystem	2015-05-27 18:59:33 +03:00
rename.nix	Make environment.checkConfigurationOptions an alias	2015-04-10 16:11:07 +02:00