Merge remote-tracking branch 'upstream/master' into gcc-7 (6a11ebfa) · Commits · jan / nixpkgs

Commit 6a11ebfa authored Jan 26, 2018 by

Tuomas Tynkkynen

Conflicts:
	pkgs/development/compilers/gcc/7/default.nix
	pkgs/development/libraries/SDL2/default.nix
	pkgs/top-level/all-packages.nix

Some changes are not shown.

For a faster browsing experience, only 20 of 753+ files are shown. Download one of the files below to see all changes.

Please register or to comment