com php-src: Merge branch 'PHP-5.5': Zend/zend.h Zend/zend_vm _def.h Zend/zend_vm_execute.h
| From: | Nikita Popov | Date: | Tue, 12 Mar 2013 16:29:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': Zend/zend.h Zend/zend_vm _def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71442@lists.php.net to get a copy of this message | ||
Commit: 81623d3a60599d05c83987dec111bf56809f901d
Author: Nikita Popov <nikic@php.net> Tue, 12 Mar 2013 17:29:54 +0100
Parents: 8eed855b84512c9458d0f407e2c1252916d9391f fcc6611de9054327441786e52444b5f8eecdd525
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=81623d3a60599d05c83987dec111bf56809f901d
Log:
Merge branch 'PHP-5.5'
Conflicts:
UPGRADING
UPGRADING.INTERNALS
Changed paths:
MM Zend/zend.h
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff: