summaryrefslogtreecommitdiffstats
path: root/Utilities/cmjsoncpp/src/lib_json/json_tool.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2022-01-121-3/+7
| | | | | * upstream-jsoncpp: jsoncpp 2022-01-12 (42e892d9)
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2021-09-091-19/+36
| | | | | * upstream-jsoncpp: jsoncpp 2020-09-25 (9059f5ca)
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-301-7/+37
| | | | | * upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)
* Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-131-0/+87
Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.