Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix		2018-05-16 03:09:33 +03:00
..
bsd	treewide: Use pkgs/build-support/roles.bash to remove copy pasta	2018-05-07 15:10:37 -04:00
darwin	Revert "darwin.libSystem: multiple outputs"	2018-05-13 10:01:52 +02:00
gnu	Merge pull request #40530 from obsidiansystems/mingw-cleanup	2018-05-14 21:05:44 -04:00
linux	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
windows	Merge pull request #40530 from obsidiansystems/mingw-cleanup	2018-05-14 21:05:44 -04:00