Merge branch 'master' into issue23errorcode
Conflicts: example/condense/condense.cpp include/rapidjson/reader.h test/unittest/readertest.cpp
Showing
doc/diagram/makefile
0 → 100644
doc/diagram/simpledom.dot
0 → 100644
doc/diagram/simpledom.png
0 → 100644
22.6 KB
doc/features.md
0 → 100644