Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: pkgs/tools/networking/network-manager/default.nix		2013-01-03 13:44:47 +01:00
..
gnu	GNU Hurd: Use preConfigure' to autoreconf' only.	2012-04-18 18:42:44 +00:00
linux	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00
windows	Adding windows jom; it does not build for me still, but it's close to it.	2012-06-05 21:24:27 +00:00