]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11baa1b 07a8e5c)
Merge branch 'PHP-5.6' into PHP-7.0
authorAndrey Hristov <andrey@php.net>
Wed, 30 Sep 2015 07:04:00 +0000 (09:04 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 30 Sep 2015 07:04:00 +0000 (09:04 +0200)
1  2 
ext/mysqli/mysqli.c patch | diff1 | diff2 | blob | history

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