Anatol Belski
|
ca9ab1c993
|
better alignment + support size_t
|
2015-02-10 16:02:55 +01:00 |
|
Jakub Zelenka
|
3159d518d0
|
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/json.c
|
2015-01-25 18:43:15 +00:00 |
|
Jakub Zelenka
|
b68da91d52
|
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
|
2014-12-27 19:42:04 +00:00 |
|
Jakub Zelenka
|
098097d83f
|
Fix compilation for json scanner
|
2014-11-30 18:29:48 +00:00 |
|
Jakub Zelenka
|
e18dd67975
|
Move json encoding stuff
|
2014-11-24 20:46:13 +00:00 |
|
Jakub Zelenka
|
d07bf91328
|
Initial import of jsond
|
2014-11-13 20:20:46 +00:00 |
|