general/json
2
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-02-09 23:52:15 +00:00
Code Issues Projects Releases Wiki Activity
2,315 Commits 20 Branches 57 Tags
327b8bb09ec1acb349d05f5c928fa60d8b93f79a
Commit Graph

12 Commits

Author SHA1 Message Date
Niels Lohmann
327b8bb09e Merge branch 'feature/strings' into develop 2018-01-21 13:55:52 +01:00
Niels Lohmann
a8f711a2f1 ➕ using Google Benchmark #921 2018-01-18 21:57:21 +01:00
Niels Lohmann
6402077ac2 Merge pull request #876 from nlohmann/feature/rfc7396 
JSON Merge Patch (RFC 7396)
 2018-01-18 06:49:31 +01:00
Niels Lohmann
7456f1d87b ♻️ re-used existing UTF-8 decoder to simplfy string serialization 2018-01-16 20:42:00 +01:00
Niels Lohmann
afe4571309 🔨 cleanup + some noexcept 2018-01-16 20:41:04 +01:00
Niels Lohmann
b182308eff 🔨 cleanup 2018-01-16 20:40:24 +01:00
Niels Lohmann
541b46132d ♻️ adjusted code to split headers 2018-01-14 10:34:43 +01:00
Théo DELRIEU
84bffd5d36 move amalgamate tool to third_party folder 2018-01-13 13:05:42 +01:00
Niels Lohmann
a66b2d20c6 🚨 removed linter warnings for Python code 2018-01-13 11:15:23 +01:00
Niels Lohmann
f4a55f26b0 ➕ added amalgamate Python script 2018-01-13 10:59:49 +01:00
Niels Lohmann
85173f5627 🔨 some clean up 2018-01-10 10:18:31 +01:00
Niels Lohmann
0a2920e0fd ♻️ reorganized code 2018-01-09 18:30:02 +01:00