aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "libjson: Initial version with support for android"HEADreplicant-6.0-0004-rc1replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-14.1cm-14.0cm-13.0Linux Build Service Account2015-03-3154-2331/+219
|\
| * libjson: Initial version with support for androidAmeya Thakur2015-03-0654-2331/+219
* | Merge "Merge remote-tracking branch 'remotes/origin/caf/json-c/master'"Linux Build Service Account2015-03-2994-0/+9820
|\|
| * Merge remote-tracking branch 'remotes/origin/caf/json-c/master'Ameya Thakur2015-03-0694-0/+9820
|/|
| * Merge pull request #153 from LeSpocky/docEric Haszlakiewicz2014-09-131-0/+5
| |\
| | * improve doc for json_object_to_json_string()Alexander Dahl2014-08-181-0/+5
| * | Merge pull request #151 from mjchinn/json_type-commaEric Haszlakiewicz2014-09-131-3/+3
| |\ \
| | * | Remove json_type enum trailing commaMichael J. Chinn2014-08-101-3/+3
| | |/
| * | Merge pull request #150 from ams-cs/masterEric Haszlakiewicz2014-09-131-0/+3
| |\ \
| | * | Fix build using MinGW.Andrew Stubbs2014-08-041-0/+3
| | |/
| * | Merge pull request #141 from AlexandruCostache/masterEric Haszlakiewicz2014-09-131-5/+2
| |\ \ | | |/ | |/|
| | * Removed duplicate check in random_seed test - bug #140Alexandru Costache2014-07-041-5/+2
| |/
| * Move the json_min() and json_max() macros to json_util.h and mark everything ...Eric Haszlakiewicz2014-05-047-17/+34
| * Fix the definition of the error_description() macro in bits.h now that json_t...Eric Haszlakiewicz2014-05-031-1/+1
| * Check for failures when allocating memory; return NULL and set errno=ENOMEM i...Eric Haszlakiewicz2014-04-191-1/+26
| * Reformat some code in json_object.cEric Haszlakiewicz2014-04-191-198/+231
| * Add an empty README file to placate autoconf.Eric Haszlakiewicz2014-04-191-0/+0
| * Fix minor typo in README file.Eric Haszlakiewicz2014-04-191-1/+1
| * Merge pull request #133 from haneefmubarak/patch-1Eric Haszlakiewicz2014-04-192-45/+63
| |\
| | * Update README.mdHaneef Mubarak2014-04-121-13/+14
| | * Update and rename README to README.mdHaneef Mubarak2014-04-122-45/+62
| * | Merge pull request #132 from pkoretic/masterEric Haszlakiewicz2014-04-191-2/+0
| |\ \ | | |/ | |/|
| | * Remove unused variable 'size'Petar Koretić2014-04-111-2/+0
| * | Update the release checklist to include calculating the tarball checksums and...Eric Haszlakiewicz2014-04-111-0/+15
| |/
| * Bump versions up to 0.12.99 since a 0.12 release was just created.Eric Haszlakiewicz2014-04-105-6/+10
| * Update the ChangeLog with the changes for the 0.12 release.Eric Haszlakiewicz2014-04-102-2/+34
| * Patch to address the following issues:Michael Clark2014-04-0911-13/+691
| * Eliminate the deprecated mc_abort() function and MC_ABORT macro.Eric Haszlakiewicz2014-03-222-23/+0
| * Make the json_tokener_errors array local. It has been deprecated for a while...Eric Haszlakiewicz2014-03-222-10/+1
| * Simplify the tests Makefile to avoid repeating the name of each test.Eric Haszlakiewicz2014-03-222-18/+20
| * Rename the "test_case" test to "test_charcase" to make it slightly less confu...Eric Haszlakiewicz2014-03-225-27/+5
| * Fix warnings from autoconf about "...no AC_LANG_SOURCE call detected..." by a...Eric Haszlakiewicz2014-03-221-2/+2
| * Issue #103: allow Infinity and -Infinity to be parsed.Eric Haszlakiewicz2014-03-227-2/+97
| * Merge pull request #123 from fingon/use-NAN-if-availableEric Haszlakiewicz2014-03-221-1/+6
| |\
| | * nan function requires -lm on some platforms; use of NAN is better, if available.Markus Stenberg2014-03-181-1/+6
| |/
| * Issue#102 - add support for parsing "NaN".Eric Haszlakiewicz2014-03-096-10/+44
| * Issue#114: check for the presence of isnan and isinf, and provide compat macr...Eric Haszlakiewicz2014-03-024-1/+42
| * Merge pull request #121 from TazeTSchnitzel/LowercaseLiteralsEric Haszlakiewicz2014-02-123-0/+53
| |\
| | * Merge branch 'master' into LowercaseLiteralsAndrea Faulds2014-02-123-0/+53
| | |\
| | | * Missing testsAndrea Faulds2014-02-123-0/+53
| * | | Merge commit '89535bb'Eric Haszlakiewicz2014-02-111-0/+1
| |\ \ \
| | * | | build: call AM_PROG_CC_C_O as requested by autoreconfRoss Burton2013-11-181-0/+1
| | | |/ | | |/|
| * | | Merge pull request #112 from TazeTSchnitzel/LowercaseLiteralsEric Haszlakiewicz2014-02-112-33/+50
| |\ \ \ | | | |/ | | |/|
| | * | Only allow lowercase literals in STRICT modeAndrea Faulds2013-11-142-33/+50
| | |/
| * | Fix Issue #111: Fix off-by-one error when range checking the input to json_to...Eric Haszlakiewicz2014-02-111-1/+1
| * | Merge pull request #109 from kdopen/use_strtodEric Haszlakiewicz2014-02-111-1/+32
| |\ \
| | * | Avoid potential overflow in json_object_get_doubleKeith Derrick2013-10-011-1/+32
| | |/
| * | Merge branch 'ebassi-master'Eric Haszlakiewicz2014-02-112-1/+27
| |\ \
| | * \ Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-masterEric Haszlakiewicz2014-02-112-1/+27
| | |\ \
| | | * | Add a check for the -Bsymbolic-functions linker flagEmmanuele Bassi2013-09-172-2/+28
| | | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 00:47:39 +0000