Merge branch 'master' into fork_master

This commit is contained in:
Marco Bubke 2018-09-27 11:56:27 +02:00 committed by GitHub
commit 86fe8a25eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,6 +23,7 @@ environment:
- compiler: gcc-6.3.0-posix - compiler: gcc-6.3.0-posix
generator: "MinGW Makefiles" generator: "MinGW Makefiles"
cxx_path: 'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin' cxx_path: 'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin'
enabled_on_pr: yes
configuration: configuration:
- Debug - Debug