delta/php-git.git/ext/json/php_json_encoder.h, branch php-7.0.0RC8 git.php.net: repository/php-src.git s/PHP Version 5/PHP Version 7/g 2015-03-13T09:09:42+00:00 Lior Kaplan kaplanlior@gmail.com 2015-03-13T09:09:42+00:00 a4384bd3d4015dceac2318f0a5c6b73ca14979bf Follow up for d0cb7153 
Follow up for d0cb7153
Merge branch 'master' into jsond 2015-01-25T18:43:15+00:00 Jakub Zelenka bukka@php.net 2015-01-25T18:43:15+00:00 3159d518d0c60dcb796b34f86b21593c7a728897 Conflicts: ext/json/JSON_parser.c ext/json/json.c 
Conflicts:
	ext/json/JSON_parser.c
	ext/json/json.c
Merge branch 'master' into jsond 2014-12-27T19:42:04+00:00 Jakub Zelenka bukka@php.net 2014-12-27T19:42:04+00:00 b68da91d52801fb2cc4d2a4a44c859ea5b6c622b 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 
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
Move json encoding stuff 2014-11-24T20:46:13+00:00 Jakub Zelenka bukka@php.net 2014-11-24T20:46:13+00:00 e18dd67975d2c00974c8cbb8ccdf1b8093a43ed4