]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5e56cf 64e3e93)
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Mon, 25 Jul 2016 15:07:41 +0000 (17:07 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 25 Jul 2016 15:07:41 +0000 (17:07 +0200)
# Resolved conflicts:
# ext/sqlite3/sqlite3.c
# ext/sqlite3/tests/bug72668.phpt

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

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