]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bfc002 af14da5)
Merge branch 'PHP-5.3' into PHP-5.4
authorChristopher Jones <sixd@php.net>
Fri, 19 Oct 2012 00:57:19 +0000 (17:57 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 19 Oct 2012 00:57:19 +0000 (17:57 -0700)
* PHP-5.3:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.