]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0547edb dc81054)
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Fri, 9 Jan 2015 15:24:32 +0000 (16:24 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 9 Jan 2015 15:24:32 +0000 (16:24 +0100)
* PHP-5.5:
  Fix bug #68260

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.