Eelco Dolstra bc1773fe16 Merge remote-tracking branch 'origin/staging' into systemd-219 ... Conflicts: pkgs/os-specific/linux/kernel/linux-3.4.nix pkgs/os-specific/linux/systemd/default.nix		2015-07-20 22:57:23 +02:00
..
config	Merge branch 'master.upstream' into staging.upstream	2015-07-05 13:06:02 -07:00
hardware	types.uniq types.str -> types.str	2015-06-15 18:12:32 +02:00
installer	nixos-generate-config: Container improvements	2015-07-17 11:27:33 +02:00
misc	Merge pull request #6702 from joachifm/dnscrypt-proxy	2015-07-12 00:17:46 -07:00
profiles	Replaces https://github.com/NixOS/nixpkgs/pull/8368	2015-06-17 19:26:17 +02:00
programs	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
security	Merge branch 'master.upstream' into staging.upstream	2015-07-05 13:06:02 -07:00
services	Merge pull request #8690 from laMudri/synaptics	2015-07-19 12:50:33 -05:00
system	Merge remote-tracking branch 'origin/staging' into systemd-219	2015-07-20 22:57:23 +02:00
tasks	Some more type cleanup	2015-06-15 18:18:46 +02:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	Merge remote-tracking branch 'origin/staging' into systemd-219	2015-07-20 22:57:23 +02:00
module-list.nix	devmon: New service	2015-07-19 13:39:00 +01:00
rename.nix	Merge pull request #6702 from joachifm/dnscrypt-proxy	2015-07-12 00:17:46 -07:00