diff options
author | Anatol Belski <ab@php.net> | 2015-05-31 21:30:46 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2015-05-31 21:30:46 +0200 |
commit | 6f1c006b6d9c25324acdff421dbeee8a8a901230 (patch) | |
tree | c1c48706593ed2cbba700e98dfd0439a197b961d /ext/json/json_parser.tab.c | |
parent | 021effbe977083bfce7387aed8e006f2eeb8e50a (diff) | |
parent | b24fedbd24cef13dab0198f154db4fdaf3c9b3eb (diff) | |
download | php-git-6f1c006b6d9c25324acdff421dbeee8a8a901230.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
split the original test to check behaviour diff on 32- and 64-bit
recovered original meaning of SXE xpath test
Diffstat (limited to 'ext/json/json_parser.tab.c')
0 files changed, 0 insertions, 0 deletions