diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-30 17:31:31 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-30 17:31:31 +0200 |
| commit | 8382da04923aae8abb70c1f4445e464345caa63a (patch) | |
| tree | 234229b940145bbfbb4753c7f17618071892fcc3 /ext/json/php_json.h | |
| parent | ea23192910baf03c98998a69e4abc2829af0f24c (diff) | |
| parent | 819a7ae6a1f1786716d77741ca5d8ad0189a0c2c (diff) | |
| download | php-git-8382da04923aae8abb70c1f4445e464345caa63a.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
- Regenerated files
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions