]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 27 Mar 2013 20:08:11 +0000 (00:08 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 27 Mar 2013 20:08:11 +0000 (00:08 +0400)
commit6e8aa096964e1d723a9cae3572b2f0affa4e53c0
treea81fec559fdb8c46aa451bdc5834ec216160d2e3
parent391a41e16701dc3a92a4af6dc4a7e23c98a0e314
parent85e5e60777209c13c71785da31af86a5e0a98d92
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
NEWS
Zend/zend_execute_API.c
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_execute_API.c
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l