]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66d4a2e 543cc08)
Merge branch 'PHP-5.6' into PHP-7.0
authorAndrey Hristov <andrey@php.net>
Mon, 17 Oct 2016 16:30:08 +0000 (19:30 +0300)
committerAndrey Hristov <andrey@php.net>
Mon, 17 Oct 2016 16:30:08 +0000 (19:30 +0300)
1  2 
ext/mysqlnd/php_mysqlnd.c patch | diff1 | diff2 | blob | history

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