]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Tue, 25 Dec 2012 06:50:35 +0000 (10:50 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 25 Dec 2012 06:50:35 +0000 (10:50 +0400)
* PHP-5.5:
  Removed deprecated fields

1  2 
Zend/zend.h

diff --cc Zend/zend.h
Simple merge