summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-09-07Add Tizen packaging filesHEADsubmit/trunk/20120907.145752accepted/trunk/20120907.1616381.0_branch1.0Rusty Lynch2-0/+57
2012-08-11CHANGES entry for #88upstreamPetri Lehtinen1-0/+4
2012-08-11Merge branch '2.3'Petri Lehtinen1-1/+1
2012-08-11fix check-exports test on ppc64Alessandro Ghedini1-1/+1
2012-07-30Add an initial CHANGES entry for v2.4Petri Lehtinen1-0/+29
2012-07-30Add json_boolean() macroPetri Lehtinen3-2/+28
2012-07-27Merge branch '2.3'Petri Lehtinen1-1/+1
2012-07-27Fix a small error in tutorialPetri Lehtinen1-1/+1
2012-06-29Document the JSON_ESCAPE_SLASH encoding flagPetri Lehtinen1-0/+5
2012-06-29Tweak slash escapingPetri Lehtinen1-16/+11
2012-06-29Merge branch 'fix-slash' of git://github.com/jrbasso/janssonPetri Lehtinen3-6/+40
2012-06-28Created flag to dump escaping slashJuan Basso4-6/+39
2012-06-27Escaping the slash when dumpJuan Basso2-3/+4
2012-06-06Merge branch '2.3'Petri Lehtinen2-14/+14
2012-06-06Bugfix: must cast void* to do pointer mathPaul Harris1-2/+2
2012-06-06Bugfix: Changed all use of ssize_t to size_t.Paul Harris1-12/+12
2012-05-19Update the documentation to mention Visual Studio 2010 supportPetri Lehtinen1-11/+14
2012-05-03Merge pull request #74 from rogerz/contribPetri Lehtinen8-3/+203
2012-05-01Fix build warnings under MinGWRogerz Zhang1-1/+1
2012-04-30Add vs2010 solution and projectRogerz Zhang7-2/+202
2012-04-29Support building on WindowsPetri Lehtinen12-102/+99
2012-04-26Merge branch '2.3'Petri Lehtinen0-0/+0
2012-04-26fix slight typo in json_pack apiref exampleJack Mitchell1-1/+1
2012-04-26Merge branch '2.3'Petri Lehtinen1-1/+1
2012-04-26fix slight typo in json_pack apiref exampleJack Mitchell1-1/+1
2012-04-26Merge branch '2.3'Petri Lehtinen1-1/+12
2012-04-26Check for missing args and envvars in run-tests.shPetri Lehtinen1-1/+12
2012-04-20Merge branch '2.3'Petri Lehtinen2-1/+26
2012-04-20jansson 2.3.1Petri Lehtinen5-5/+30
2012-04-18Merge branch '2.3'Petri Lehtinen2-88/+99
2012-04-18Fix tutorial to use Github API v3Petri Lehtinen2-88/+99
2012-04-18Merge branch '2.3'Petri Lehtinen1-5/+5
2012-04-18load: Change buffer_pos to be a size_tJanne Kulmala1-1/+1
2012-04-18load: Avoid unexpected behaviour in macro expansionJanne Kulmala1-4/+4
2012-03-26Document and tweak json_load_callback()Petri Lehtinen4-5/+33
2012-03-25Merge pull request #60 from rogerz/contribPetri Lehtinen1-0/+1
2012-03-25Ignore the binary test_load_callbackRogerz1-0/+1
2012-03-22Merge branch '2.3'Petri Lehtinen1-2/+4
2012-03-22Add json_load_callback to the list of exported symbolsPetri Lehtinen1-1/+2
2012-03-22Merge pull request #57 from rogerz/contribPetri Lehtinen4-0/+134
2012-03-22Add json_load_callback()Rogerz Zhang4-0/+134
2012-03-22Make test stripping locale independentPetri Lehtinen1-2/+4
2012-03-21Merge branch '2.3'Petri Lehtinen1-0/+1
2012-03-21Ignore *.exeRogerz Zhang1-0/+1
2012-03-20Merge branch '2.3'Petri Lehtinen40-44/+44
2012-03-20Update copyright notices for 2012Petri Lehtinen40-44/+44
2012-03-20Merge branch '2.3'Petri Lehtinen3-11/+14
2012-03-20Make sure strtoll() is available when using long longPetri Lehtinen3-11/+14
2012-03-11Merge branch '2.3'Petri Lehtinen1-4/+0
2012-03-11Remove unused declarationsPetri Lehtinen1-4/+0