]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Wed, 1 Feb 2017 13:05:57 +0000 (16:05 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 1 Feb 2017 13:05:57 +0000 (16:05 +0300)
commit8f7f8d3f9b551c64d029c0df7217f2b168a1201e
tree70f101a352aa552f3ae93b1d7ed69736200bcfe8
parentba358c56956f9c8cb400dcdaf952fb9435caef21
parent15e9aa1706533cba39a165f78806400cc913e906
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fixed macro
Zend/zend_types.h