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
..
darwin	update framework impure deps	2015-07-11 16:05:04 -07:00
gnu	samba: Revert style changes and get rid of some dependencies	2015-06-01 15:35:59 +02:00
linux	Merge remote-tracking branch 'origin/staging' into systemd-219	2015-07-20 22:57:23 +02:00
windows	libgcrypt: Massive cleanup and make 1.6 the default	2015-05-01 17:41:42 -07:00