]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorPierre Joye <pierre.php@gmail.com>
Wed, 28 Mar 2012 00:15:02 +0000 (02:15 +0200)
committerPierre Joye <pierre.php@gmail.com>
Wed, 28 Mar 2012 00:15:02 +0000 (02:15 +0200)
commit13bd9c2c3d3e535fa9d235e9faa7f8d4ff7633f9
tree125e433f1482b7830466b76b538dbac0dc9fc89d
parent7894525d40bc1ce46e2a3f390d7a614f389cace2
parentc195596280c2e48f68b6c1c97215b8c4417e2274
Merge branch 'PHP-5.4'

* PHP-5.4:
  - fix bug #61504, fix build errors on windows and possibly other

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