php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
108,604 Commits 549 Branches 1,485 Tags
ecb698b21dc27de088cc2e03436d5ff5e7e48391
Commit Graph

54 Commits

Author SHA1 Message Date
Jakub Zelenka 8304e468cd Replace encoder functions json prefix with php_json 2015-01-10 19:13:28 +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 f18aae6042 Fix compilation for json_encoder 2014-11-30 17:47:17 +00:00
Jakub Zelenka e18dd67975 Move json encoding stuff 2014-11-24 20:46:13 +00:00