]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5324416 0265c2d)
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Wed, 3 Jul 2013 14:58:20 +0000 (16:58 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 3 Jul 2013 14:58:20 +0000 (16:58 +0200)
Conflicts:
Zend/acinclude.m4

1  2 
ext/mysqli/mysqli_nonapi.c patch | diff1 | diff2 | blob | history

diff --cc ext/mysqli/mysqli_nonapi.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.