[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend.h Zend/zend_vm_def.h Zend/zend_vm_execute.h

[Nikita Popov]

Commit:    81623d3a60599d05c83987dec111bf56809f901d
Author:    Nikita Popov <ni...@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:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php