summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-12-10 13:34:23 +0100
committerJohannes Schlüter <johannes@php.net>2012-12-10 13:34:23 +0100
commit1aba46081ad4d3f06039bfa56a00cd8746d8f2cd (patch)
tree827f0e2116142891138099a326e0a11999a3c4f6 /ext/mysql/php_mysql.c
parent70b65f310016d3b777da4bd0ceb6f775658c4590 (diff)
parentbd36d4901caedda52ff2e39469af34fb0bd15089 (diff)
downloadphp-git-1aba46081ad4d3f06039bfa56a00cd8746d8f2cd.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