citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #3753 from spbennett/json_3.12 

Upgrade JSON for Modern C++
This commit is contained in:
Weiyi Wang 2018-05-25 20:39:12 +03:00 committed by GitHub
parent cad00ea5fd b9eeca218d
commit 03209efe99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10534 additions and 7748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
externals/json/README.md vendored
View File

@ -1,7 +1,9 @@
JSON for Modern C++ JSON for Modern C++
=================== ===================
v3.1.2
This is a mirror providing the single required header file. This is a mirror providing the single required header file.
The original repository can be found at The original repository can be found at:
https://github.com/nlohmann/json/commit/21d23982cafe826cae088b2bb37cb40c8e7a81fe https://github.com/nlohmann/json/commit/d2dd27dc3b8472dbaa7d66f83619b3ebcd9185fe

18212
externals/json/json.hpp vendored
View File

File diff suppressed because it is too large Load Diff