diff options
| author | Anatol Belski <ab@php.net> | 2015-02-06 19:59:55 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-06 19:59:55 +0100 |
| commit | 464667153d7ca35ac9ffecdc4891f8a9469aebcb (patch) | |
| tree | 1571abf76fdd62eb038827ede774a05c77a4d6b8 /ext/json/php_json_parser.h | |
| parent | e6d16c095625c577be8091a7f368d0465c2b4644 (diff) | |
| parent | 9bf95d82911dc7028c624494e9ac914f615f66ed (diff) | |
| download | php-git-464667153d7ca35ac9ffecdc4891f8a9469aebcb.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix setting default ODBCVER value in config.w32
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions