haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-16 03:15:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/manual_lexer

Browse source
This commit is contained in:
Niels Lohmann 2017-03-28 21:39:36 +02:00
parent d37ca2eba8 19cd206d99
commit d025b6aaf7
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -148,6 +148,9 @@ matrix:
- os: osx
osx_image: xcode8.2
- os: osx
osx_image: xcode8.3
# Linux / GCC
- os: linux

1
README.md
View file

@ -744,6 +744,7 @@ The following compilers are currently used in continuous integration at [Travis]
| Clang Xcode 8.0 | Darwin Kernel Version 15.6.0 | Apple LLVM version 8.0.0 (clang-800.0.38) |
| Clang Xcode 8.1 | Darwin Kernel Version 16.1.0 (macOS 10.12.1) | Apple LLVM version 8.0.0 (clang-800.0.42.1) |
| Clang Xcode 8.2 | Darwin Kernel Version 16.1.0 (macOS 10.12.1) | Apple LLVM version 8.0.0 (clang-800.0.42.1) |
| Clang Xcode 8.3 | Darwin Kernel Version 16.5.0 (macOS 10.12.4) | Apple LLVM version 8.1.0 (clang-802.0.38) |
| Visual Studio 14 2015 | Windows Server 2012 R2 (x64) | Microsoft (R) Build Engine version 14.0.25123.0 |
| Visual Studio 2017 | Windows Server 2016 | Microsoft (R) Build Engine version 15.1.548.43366 |