]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07f3bac e8bf18b)
Merge branch 'PHP-5.5' into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Tue, 28 Jan 2014 12:34:33 +0000 (13:34 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Tue, 28 Jan 2014 12:34:33 +0000 (13:34 +0100)
1  2 
ext/pdo/pdo_dbh.c patch | diff1 | diff2 | blob | history

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