]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea23192 819a7ae)
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Mon, 30 Apr 2012 15:31:31 +0000 (17:31 +0200)
committerAnatoliy Belsky <ab@php.net>
Mon, 30 Apr 2012 15:31:31 +0000 (17:31 +0200)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.