]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorChristopher Jones <sixd@php.net>
Tue, 25 Jun 2013 19:00:56 +0000 (12:00 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 25 Jun 2013 19:00:56 +0000 (12:00 -0700)
commit53ec0650770114b69e2d23dfd53adb93b72e5f9a
tree304f3292a4eb3868248e49bf705aef0ed95aecdd
parentd99a76ca965dac487b457a6599a4f42ba06ad033
parenta52258ae175ea49ac03b8aea21d20c36a67c61e2
Merge branch 'PHP-5.4'

* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)