Tuomas Tynkkynen 6a11ebfae9 Merge remote-tracking branch 'upstream/master' into gcc-7 ... Conflicts: pkgs/development/compilers/gcc/7/default.nix pkgs/development/libraries/SDL2/default.nix pkgs/top-level/all-packages.nix		2018-01-26 16:46:43 +02:00
..
darwin	Merge pull request #25713 from jbaum98/darwin-trash	2018-01-12 09:34:03 +01:00
gnu
linux	Merge remote-tracking branch 'upstream/master' into gcc-7	2018-01-26 16:46:43 +02:00
windows	mingw-w64-pthreads: The C compiler is needed	2018-01-02 19:01:18 -05:00