summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-12-10 13:36:05 +0100
committerJohannes Schlüter <johannes@php.net>2012-12-10 13:36:05 +0100
commitc007ba4740e90a7a73bc8c6350804670e4b49cc1 (patch)
tree827f0e2116142891138099a326e0a11999a3c4f6 /ext/mysql/php_mysql.c
parent1aba46081ad4d3f06039bfa56a00cd8746d8f2cd (diff)
parent95fd52ff3d3cc2162baf4d30fe06cf37da398050 (diff)
downloadphp-git-c007ba4740e90a7a73bc8c6350804670e4b49cc1.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