com php-src: Merge branch 'PHP-7.0': Zend/zend_vm_def.h Zend/zend_vm_execute.h

From: Date: Sat, 28 May 2016 11:22:49 +0000
Subject: com php-src: Merge branch 'PHP-7.0': Zend/zend_vm_def.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92231@lists.php.net to get a copy of this message
Commit: 79de9fa4aa9a9c68c829a5c8c5945a631e5ba38a Author: Nikita Popov <nikic@php.net> Sat, 28 May 2016 13:22:49 +0200 Parents: 60a417c5b761cd78e3763a3789d59732771a62b1 4746e5efcb135051e003294f4721792139779fd0 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=79de9fa4aa9a9c68c829a5c8c5945a631e5ba38a Log: Merge branch 'PHP-7.0' Conflicts: Zend/zend_vm_execute.h Changed paths: MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h Diff: <Diff exceeded maximum size>

« previous php.cvs (#92231) next »