Merge branch 'jsoncpp_upgrade_130' of https://github.com/richardeakin…

…/Cinder into master_json_upgrade
couchworldgames · Jan 25, 2015 · 5bdbb76 · 5bdbb76
2 parents 938f2ce + ee838e3
commit 5bdbb76
Show file tree

Hide file tree

Showing 34 changed files with 6,348 additions and 7,063 deletions.
diff --git a/include/json/autolink.h b/include/json/autolink.h
diff --git a/include/json/config.h b/include/json/config.h
diff --git a/include/json/features.h b/include/json/features.h
diff --git a/include/json/forwards.h b/include/json/forwards.h
diff --git a/include/json/json.h b/include/json/json.h