]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00b4862 74ee335)
Merge branch 'PHP-5.3' into PHP-5.4
authorPierre Joye <pierre.php@gmail.com>
Wed, 28 Mar 2012 00:11:06 +0000 (02:11 +0200)
committerPierre Joye <pierre.php@gmail.com>
Wed, 28 Mar 2012 00:11:06 +0000 (02:11 +0200)
* PHP-5.3:
  - fix bug #61504, fix build errors on windows and possibly other

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


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