]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e4b77c 1813fe9)
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Sat, 29 Nov 2014 10:39:37 +0000 (11:39 +0100)
committerJulien Pauli <jpauli@php.net>
Sat, 29 Nov 2014 10:39:37 +0000 (11:39 +0100)
* PHP-5.5:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1

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

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