Christopher Dunn 721de4b9fd Merge branch 'master' (1.4.1) into v0.8.z (0.8.1)

2015-02-13 10:26:07 -06:00

..

assertions.h

allow stream ops for JSON_FAIL_MESSAGE

2015-01-20 16:25:26 -06:00

autolink.h

Ran clang-format over all .h and .cpp files.

2014-07-01 08:48:54 +10:00

config.h

Ran clang-format again.

2014-07-01 09:20:48 +10:00

features.h

partially revert 'Added features that allow the reader to accept common non-standard JSON.'

2015-02-11 11:22:07 -06:00

forwards.h

Ran clang-format over all .h and .cpp files.

2014-07-01 08:48:54 +10:00

json.h

Ran clang-format over all .h and .cpp files.

2014-07-01 08:48:54 +10:00

reader.h

Merge branch 'master' (1.4.1) into v0.8.z (0.8.1)

2015-02-13 10:26:07 -06:00

value.h

partially revert 'fix bug for static init'

2015-02-11 11:22:07 -06:00

version.h

Merge branch 'master' (1.4.1) into v0.8.z (0.8.1)

2015-02-13 10:26:07 -06:00

writer.h

revert 'Made it possible to drop null placeholders from array output.'

2015-02-11 11:22:07 -06:00