summaryrefslogtreecommitdiff
path: root/ext/json/php_json_parser.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-02-06 20:00:26 +0100
committerAnatol Belski <ab@php.net>2015-02-06 20:00:26 +0100
commit47af2381ebc487949f30888c6673b40511d1b2b3 (patch)
tree5a0634f433ef24c4bacf3cfab0de3804034084bb /ext/json/php_json_parser.h
parent0f9b686eb2e6b27158bf4bb7384fb006a924cfbd (diff)
parent464667153d7ca35ac9ffecdc4891f8a9469aebcb (diff)
downloadphp-git-47af2381ebc487949f30888c6673b40511d1b2b3.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: fix setting default ODBCVER value in config.w32
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions