]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c67714b 586fc49)
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Fri, 26 Jul 2013 18:34:21 +0000 (11:34 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 26 Jul 2013 18:34:21 +0000 (11:34 -0700)
* 'master' of https://git.php.net/repository/php-src:
  Fix --enable-maintainer-zts mode in OCI8 2.0


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