]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristopher Jones <sixd@php.net>
Wed, 19 Mar 2014 22:23:40 +0000 (15:23 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 19 Mar 2014 22:23:40 +0000 (15:23 -0700)
* PHP-5.6:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.


Trivial merge