]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c2c620 cac09f3)
Merge branch 'PHP-5.4'
authorChristopher Jones <sixd@php.net>
Tue, 1 May 2012 21:47:18 +0000 (14:47 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 1 May 2012 21:47:18 +0000 (14:47 -0700)
* PHP-5.4:
  Fix masking in bug61115-1.phpt

Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h


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