haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-05 13:56:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/nlohmann/json into develop

Browse source
This commit is contained in:
Niels Lohmann 2020-12-12 17:17:43 +01:00
parent d028eff9e1 be32cc4f5e
commit 97fe455ad5
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 598 additions and 294 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/thirdparty/doctest/LICENSE.txt vendored
View file

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2016-2019 Viktor Kirilov
Copyright (c) 2016-2020 Viktor Kirilov
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.

888
test/thirdparty/doctest/doctest.h vendored
View file

File diff suppressed because it is too large Load diff