summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2014-02-17 06:38:36 +0900
committerYasuo Ohgaki <yohgaki@php.net>2014-02-17 06:38:36 +0900
commitd06551b957492f589796ff3de1eb1afa57afe087 (patch)
tree497e8b0e889b2bc16a3b3ea34695cdd3b0923a07 /ext/json/php_json.h
parent540a28b4ecfd48e1bbbb2f3e8ef2a20470194e02 (diff)
parentd8aa13029675c6651243f144c328411c9f9c38d5 (diff)
downloadphp-git-d06551b957492f589796ff3de1eb1afa57afe087.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Imprement FR #25854 Return value for pg_insert should be resource instead of bool
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions