]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 16 Jan 2018 07:34:15 +0000 (10:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 16 Jan 2018 07:34:15 +0000 (10:34 +0300)
* 'master' of git.php.net:php-src:
  Added missed header file
  Added ZEND_API zend_cpu_supports


Trivial merge