aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-02-11Merge pull request #267 from Mephistophiles/masterPetri Lehtinen1-67/+74
2016-02-10Fix libdir is wrong when compile with cmakeThanabodee Charoenpiriyakij1-23/+10
2016-02-03[Optimized functions]Maxim Zhukov1-67/+74
2015-12-23Fix a typoPetri Lehtinen1-1/+1
2015-12-23Update CHANGESPetri Lehtinen1-0/+74
2015-12-23Change doc version to 2.8-devPetri Lehtinen1-1/+1
2015-12-23Fix a commentPetri Lehtinen1-1/+2
2015-12-23Merge pull request #263 from wking/display-first-unrecognized-keyPetri Lehtinen3-8/+57
2015-12-22pack_unpack: List unrecognized keys in strict unpackingW. Trevor King3-8/+57
2015-12-22Add versionadded to json_get_alloc_funcs docPetri Lehtinen1-0/+2
2015-12-22Merge pull request #264 from npmccallum/masterPetri Lehtinen5-1/+21
2015-12-21Add json_get_alloc_funcs() to allow alloc function fetchingNathaniel McCallum5-1/+21
2015-10-20doc: Fix a broken linkPetri Lehtinen1-1/+1
2015-10-14Merge pull request #257 from denis2342/masterPetri Lehtinen1-10/+10
2015-10-12changed code from while to do/whileDenis Ahrens1-10/+10
2015-10-05Merge pull request #255 from gonzzor/snprintf_dump.cPetri Lehtinen1-2/+2
2015-10-05Format %x expects unsigned int, not intJonas Jonsson1-2/+2
2015-10-05Use sizeof(seq) instead of magic number 13Jonas Jonsson1-2/+2
2015-09-08Merge pull request #248 from phoenix0428/patch-1Petri Lehtinen1-1/+1
2015-09-01Merge pull request #252 from OlehKulykov/masterPetri Lehtinen2-3/+27
2015-08-31Buildable with MS Compiler version >= 1900OlehKulykov2-3/+27
2015-08-26Add json_object_foreach_safePetri Lehtinen3-0/+39
2015-08-13Update test_memory_funcs.cKinam Kim1-1/+1
2015-05-19Merge branch '2.7'Petri Lehtinen0-0/+0
2015-05-19doc: Copying doesn't preserve key insertion order2.7Petri Lehtinen1-0/+4
2015-05-19doc: Copying doesn't preserve key insertion orderPetri Lehtinen1-0/+4
2015-05-04Merge pull request #234 from flok99/masterPetri Lehtinen1-3/+7
2015-05-01Optimized dump_indent to reduce the number of fwrite calls.Folkert van Heusden1-3/+7
2015-04-30Merge pull request #233 from haldean/masterPetri Lehtinen3-6/+6
2015-04-30use snprintf and strncpy in place of sprintf and strcpyHaldean3-6/+6
2015-03-07Don't crash when building documentation man pagesPetri Lehtinen1-1/+2
2015-02-07Fix a use after freePetri Lehtinen1-1/+1
2015-02-05Merge pull request #221 from lioncash/testPetri Lehtinen1-1/+1
2015-02-05test_object: Fix a duplicate conditional check in test_iteratorsLioncash1-1/+1
2015-01-14Merge pull request #217 from JoakimSoderberg/simple_parse_cmakePetri Lehtinen1-1/+6
2015-01-14Merge pull request #216 from JoakimSoderberg/infinity_warningPetri Lehtinen1-12/+29
2015-01-13Disable warning for deliberate use on MSVS.Joakim Soderberg1-12/+29
2015-01-13Compile simple_parse example for CMake project.Joakim Soderberg1-1/+6
2014-12-30examples/README.rst: Fix formattingPetri Lehtinen1-1/+1
2014-12-30Add Makefile.am for examplesPetri Lehtinen3-0/+20
2014-12-30examples/simple_parse.c: Reindent, fix warnings & stylePetri Lehtinen1-80/+87
2014-12-30Merge pull request #214 from rdpoor/masterPetri Lehtinen1-0/+196
2014-12-29use fgets() rather than getline()Robert Poor1-17/+11
2014-12-26adding simple-parse exampleRobert Poor1-0/+202
2014-12-19Increase test coveragePetri Lehtinen6-8/+75
2014-12-19Add a test case for \u0000Petri Lehtinen2-0/+3
2014-12-18Honor JSON_DECODE_INT_AS_REAL at lexical stagePetri Lehtinen2-16/+25
2014-12-18doc: Update the Getting Started chapterPetri Lehtinen1-9/+8
2014-12-18Make it possible to set initial hashtable sizePetri Lehtinen4-1/+16
2014-12-15wip: add testsPetri Lehtinen2-0/+3