Merge remote-tracking branch 'jgallagher/master' into vtab

This commit is contained in:
gwenn
2018-05-06 08:00:12 +02:00
19 changed files with 226 additions and 49 deletions

View File

@@ -1,8 +1,8 @@
environment:
matrix:
- TARGET: 1.24.1-x86_64-pc-windows-gnu
- TARGET: 1.25.0-x86_64-pc-windows-gnu
MSYS2_BITS: 64
- TARGET: 1.24.1-x86_64-pc-windows-msvc
- TARGET: 1.25.0-x86_64-pc-windows-msvc
VCPKG_DEFAULT_TRIPLET: x64-windows
VCPKGRS_DYNAMIC: 1
- TARGET: nightly-x86_64-pc-windows-msvc