Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/top-level/all-packages.nix		2018-04-03 02:22:54 +03:00
..
darwin	Merge pull request #37840 from matthewbauer/unixtools	2018-03-27 18:43:03 -05:00
gnu
linux	Merge remote-tracking branch 'upstream/master' into staging	2018-04-03 02:22:54 +03:00
windows	mingw-w64: 4.0.6 -> 5.0.3	2018-03-20 13:09:53 -04:00