]> granicus.if.org Git - php/commit
Merge branch 'configure12c' into PHP-5.4
authorChristopher Jones <sixd@php.net>
Tue, 25 Jun 2013 19:00:08 +0000 (12:00 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 25 Jun 2013 19:00:08 +0000 (12:00 -0700)
commita52258ae175ea49ac03b8aea21d20c36a67c61e2
treec0e39de5d0587927129175a9865120d47f994d95
parent38eb909d064ecbbf51d5869a629dae91a6ed9dcf
parent423b132a7a076ff641bd3ab4dc2aa03cd8e4fd1b
Merge branch 'configure12c' into PHP-5.4

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