]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorChristopher Jones <christopher.jones@oracle.com>
Tue, 20 Jun 2017 04:34:05 +0000 (14:34 +1000)
committerChristopher Jones <christopher.jones@oracle.com>
Tue, 20 Jun 2017 04:34:05 +0000 (14:34 +1000)
* PHP-7.1:
  oci8 - Implementation of Oracle TAF Callback

1  2 
ext/oci8/oci8_interface.c
ext/oci8/php_oci8.h
ext/oci8/php_oci8_int.h

Simple merge
Simple merge
Simple merge