summaryrefslogtreecommitdiffstats
path: root/Utilities/cmjsoncpp/include/json/features.h
Commit message (Collapse)AuthorAgeFilesLines
* jsoncpp: Fix compilation on SunProBrad King2017-08-301-0/+4
| | | | The SunPro compiler does not support `#pragma pack`.
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-301-1/+5
| | | | | * upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)
* Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-131-0/+57
Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.