summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2014-02-23 14:56:32 +0100
committerJohannes Schlüter <johannes@php.net>2014-02-23 14:56:32 +0100
commit2198bbce868e8a3423e05c573ab4f69417ef5b88 (patch)
tree30db5e4922088e18e6b58d5100d8deb33dfb0195 /ext/mysql/php_mysql.c
parent851f36288299ff3dc4f8ff6d0fd9e5f56211d583 (diff)
parent3f258e6b46f1f74c672f68a23b2b0905b435aa5a (diff)
downloadphp-git-2198bbce868e8a3423e05c573ab4f69417ef5b88.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions