Tuomas Tynkkynen 003473613a Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/top-level/all-packages.nix		2018-05-18 03:54:38 +03:00
..
bsd	treewide: Use pkgs/build-support/roles.bash to remove copy pasta	2018-05-07 15:10:37 -04:00
darwin	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 15:16:08 -04: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-18 03:54:38 +03:00
windows	Merge pull request #40530 from obsidiansystems/mingw-cleanup	2018-05-14 21:05:44 -04:00