]> granicus.if.org Git - php/commit
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)
commitc195596280c2e48f68b6c1c97215b8c4417e2274
tree2c39c34217bc160f6659e021d40252887cc9ebe8
parent00b486216742b5909712507398c1279b22aba15f
parent74ee335e3aea8c48380334098b8d20eb54d6c6be
Merge branch 'PHP-5.3' into PHP-5.4

* 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