Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix		2018-02-28 20:52:49 +02:00
..
darwin	Merge pull request #33374 from dtzWill/update/llvm-5-default	2018-02-11 18:29:26 +01:00
gnu
linux	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
windows	mingw-w64-pthreads: The C compiler is needed	2018-01-02 19:01:18 -05:00