summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-02-20 19:01:45 +0100
committerAnatol Belski <ab@php.net>2014-02-20 19:01:45 +0100
commit2b767f83dcab2683270a534481fc7ac11b0cd9d4 (patch)
tree7f8aabc21855189916fbe812004a65a5e49f4383 /ext/mysql/php_mysql.c
parent34f39f26e10cae3ba5d8798055540615cb042d00 (diff)
parent0746e6af0861c22773aa414bcf6e59877bb7827d (diff)
downloadphp-git-2b767f83dcab2683270a534481fc7ac11b0cd9d4.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: updated libmagic.patch in 5.4/5
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions