summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-05-14 11:16:01 +0200
committerAnatol Belski <ab@php.net>2013-05-14 11:16:01 +0200
commit75ee1a6113600f3f09945a52a56417b33f454fe3 (patch)
tree59167526cca8cd752810beb489fd635ee8317968 /ext/mysql/php_mysql.c
parentad210f2c10e07175a39da8ca9b61bd6bf07d6f75 (diff)
parent1a46a102d96e08d1256770ddca3e9d955bcec025 (diff)
downloadphp-git-75ee1a6113600f3f09945a52a56417b33f454fe3.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: updated libmagic.patch after fix for #64830
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions