]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Wed, 4 Jan 2017 13:35:01 +0000 (13:35 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 4 Jan 2017 13:36:04 +0000 (13:36 +0000)
commit6c9164047e7b5c1879d7d43d36622aec8e83d7aa
tree3bc261ac9092ca1e37258edfb939a1b38d018d10
parentb15cc7913a1aa108b3e27c8c361202785bea4033
parent63d116e5711e995f201ba6411bcb3929e5cbf041
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  get_defined_functions additional parameter to exclude disabled functions
  news entry for PR #1312
NEWS
Zend/zend_builtin_functions.c