aboutsummaryrefslogtreecommitdiffstats
path: root/json-lexer.c
Commit message (Collapse)AuthorAgeFilesLines
* json-lexer.c, json-parser.c: minor integrateDavid 'Digit' Turner2011-06-011-7/+3
| | | | Change-Id: Id7a703f5c93c9a9cbd47a5f44bfdf900080e7430
* upstream: minor json-lexer.c integration.David 'Digit' Turner2011-01-021-3/+7
| | | | | Change-Id: Ia949694386f79c763ac4f001924a9e3cca754933 Note: Keep our fix for mingw builds.
* fix win32 build.David Turner2010-09-131-3/+3
|
* upstream: json update.David Turner2010-09-131-61/+55
|
* Fix Windows SDK build. It seems it defines ERROR as a macro somewhere.David 'Digit' Turner2010-05-111-0/+2
| | | | Change-Id: I35e1995add0faa00b336c4ef470a93b1c5de5a31
* Upstream: integrate various misc. minor changesDavid 'Digit' Turner2010-05-111-0/+16
| | | | Change-Id: I7d3eca1350f980d93f9f3198fa5250fb776de729
* Upstream: Misc integration - includes qobject.h and related sourcesDavid 'Digit' Turner2010-05-111-0/+327
Change-Id: Idfa93ab5c67c95a3bc1869eeaf3a84a75fe24cd6