William A. Kennington III 4ead61ca39 Merge remote-tracking branch 'upstream/master' into master.upstream		2015-11-14 12:33:53 -08:00
..
config	i18n: add color scheme option (close #9626)	2015-11-09 14:53:59 +01:00
hardware	Put all firmware in $out/lib/firmware	2015-08-25 00:40:34 +02:00
installer	Merge pull request #10586 from dezgeg/pr-arm-tweaks	2015-10-25 04:31:03 +03:00
misc	calibre-server service: init	2015-09-27 20:31:17 -07:00
profiles	nixos: add xfs support to profiles/minimal	2015-09-18 18:58:18 +00:00
programs	nixos/environment: don't set Qt 5 paths	2015-10-30 16:10:37 -05:00
security	nixos: fix some types	2015-09-18 18:48:50 +00:00
services	Merge remote-tracking branch 'upstream/master' into master.upstream	2015-11-14 12:33:53 -08:00
system	Merge commit 'cb21b77' into master.upstream	2015-11-13 15:53:10 -08:00
tasks	Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""	2015-11-14 12:32:51 -08:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	virtualbox service: hide vboxnet0 from NetworkManager, fixes #10862	2015-11-10 12:21:35 +01:00
module-list.nix	nixos/autofs: revive and update to systemd	2015-11-11 16:18:57 +03:00
rename.nix	Factor out option renaming	2015-10-14 18:18:47 +02:00