Eelco Dolstra 916793cf13 Merge branch 'master' into systemd-219 ... Conflicts: nixos/modules/system/boot/systemd.nix pkgs/applications/networking/p2p/transmission/default.nix pkgs/development/libraries/libseccomp/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/top-level/all-packages.nix		2015-09-07 21:28:33 +02:00
..
darwin	Revert "add Darwin's flavor of lsof"	2015-08-21 12:05:06 +02:00
gnu	samba: Revert style changes and get rid of some dependencies	2015-06-01 15:35:59 +02:00
linux	Merge branch 'master' into systemd-219	2015-09-07 21:28:33 +02:00
windows	libgcrypt: Massive cleanup and make 1.6 the default	2015-05-01 17:41:42 -07:00