summaryrefslogtreecommitdiffstats
path: root/Utilities/cmjsoncpp/include/json/version.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-301-5/+11
| | | | | * upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)
* Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-131-0/+14
Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.