]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0cc25b 06f5f65)
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Wed, 16 Jul 2014 16:25:31 +0000 (19:25 +0300)
committerAndrey Hristov <andrey@php.net>
Wed, 16 Jul 2014 16:25:31 +0000 (19:25 +0300)
Conflicts:
NEWS

1  2 
ext/mysqlnd/mysqlnd_net.c patch | diff1 | diff2 | blob | history

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