]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 23 Jan 2017 05:34:21 +0000 (05:34 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 23 Jan 2017 05:34:21 +0000 (05:34 +0000)
commit5589df128cd7f98c48f5d2c1c154eb927f84f53c
tree23d273d65476ad944980646fabbb831543185d67
parent8bda5420648021dd6f92bac45915d6422b636df3
parentd636467937fcfbd708f2b06c9e060bcbe9a63679
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  move decl to correct place
Zend/zend_builtin_functions.c