Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Hu Wei
Json
Commits
15acf260
Unverified
Commit
15acf260
authored
7 years ago
by
Niels Lohmann
Browse files
Options
Download
Plain Diff
Merge branch 'release/3.1.0'
parents
a43347e1
a8fcfd98
master
coverity_scan
3.6.1
3.3.0
3.2.0
3.1.2
3.1.0
No related merge requests found
Changes
453
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.github/CONTRIBUTING.md
+5
-3
.github/CONTRIBUTING.md
.github/PULL_REQUEST_TEMPLATE.md
+3
-0
.github/PULL_REQUEST_TEMPLATE.md
.travis.yml
+14
-8
.travis.yml
CMakeLists.txt
+18
-7
CMakeLists.txt
ChangeLog.md
+64
-1
ChangeLog.md
LICENSE.MIT
+1
-1
LICENSE.MIT
Makefile
+69
-6
Makefile
README.md
+77
-25
README.md
benchmarks/CMakeLists.txt
+26
-0
benchmarks/CMakeLists.txt
benchmarks/Makefile
+0
-21
benchmarks/Makefile
benchmarks/README.md
+0
-3
benchmarks/README.md
benchmarks/data/jeopardy/jeopardy.json
+0
-0
benchmarks/data/jeopardy/jeopardy.json
benchmarks/data/nativejson-benchmark/canada.json
+0
-0
benchmarks/data/nativejson-benchmark/canada.json
benchmarks/data/nativejson-benchmark/citm_catalog.json
+0
-0
benchmarks/data/nativejson-benchmark/citm_catalog.json
benchmarks/data/nativejson-benchmark/twitter.json
+0
-0
benchmarks/data/nativejson-benchmark/twitter.json
benchmarks/files/numbers/generate.py
+0
-25
benchmarks/files/numbers/generate.py
benchmarks/src/benchmarks.cpp
+90
-116
benchmarks/src/benchmarks.cpp
benchmarks/src/benchmarks_simple.cpp
+0
-158
benchmarks/src/benchmarks_simple.cpp
benchmarks/thirdparty/benchmark/AUTHORS
+43
-0
benchmarks/thirdparty/benchmark/AUTHORS
benchmarks/thirdparty/benchmark/CMakeLists.txt
+213
-0
benchmarks/thirdparty/benchmark/CMakeLists.txt
with
623 additions
and
374 deletions
+623
-374
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets