]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2ce0df d3f390a)
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Thu, 10 Apr 2014 15:22:01 +0000 (18:22 +0300)
committerAndrey Hristov <andrey@php.net>
Thu, 10 Apr 2014 15:22:01 +0000 (18:22 +0300)
Conflicts:
NEWS
ext/mysqlnd/mysqlnd_result.c

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

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