com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/Makefile.am Zend/Zend.dsp Zend/ZendTS.dsp Zend/zend_vm_gen.php Zend /zend_vm_opcodes.c
configure.in win32/build/con fig.w32

From: Date: Sat, 21 Dec 2013 23:54:59 +0000
Subject: com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/Makefile.am Zend/Zend.dsp Zend/ZendTS.dsp Zend/zend_vm_gen.php Zend /zend_vm_opcodes.c
configure.in win32/build/con fig.w32
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75386@lists.php.net to get a copy of this message
Commit: 7e3af096b3fb383826fc7d656ceb043590a56e70 Author: Bob Weinand <bobwei9@hotmail.com> Sun, 22 Dec 2013 00:54:59 +0100 Parents: 00cc4dccb8aa710514e689fdafb922b5178e025f 97bf25438526a2d4d60d4284bd12c1d40ae7134c Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e3af096b3fb383826fc7d656ceb043590a56e70 Log: Merge branch 'PHP-5.4' into PHP-5.5 Conflicts: Zend/zend_vm_opcodes.c Changed paths: MM Zend/Makefile.am MM Zend/Zend.dsp MM Zend/ZendTS.dsp MM Zend/zend_vm_gen.php MM Zend/zend_vm_opcodes.c MM configure.in MM win32/build/config.w32 Diff: diff --cc Zend/zend_vm_opcodes.c index 55a0de1,d5e7b82..c565510 --- a/Zend/zend_vm_opcodes.c +++ b/Zend/zend_vm_opcodes.c @@@ -18,7 -18,9 +18,9 @@@ +----------------------------------------------------------------------+ */ + #include <stdio.h> + -const char *zend_vm_opcodes_map[159] = { +const char *zend_vm_opcodes_map[164] = { "ZEND_NOP", "ZEND_ADD", "ZEND_SUB",

« previous php.cvs (#75386) next »