summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2014-07-31 21:28:09 +0300
committerAndrey Hristov <andrey@php.net>2014-07-31 21:28:09 +0300
commitf5deb18b205f89cb6708f97f451b43ad5ece4197 (patch)
tree743306eadb6da98f0ee52cf9819ff7dd01c6f592 /ext/mysql/php_mysql.c
parent6a4f0b14eb347285e130719fb6b3ecf29bc1e36b (diff)
parent95febf26c67b7ccb8703dc8b005658ebd851cb89 (diff)
downloadphp-git-f5deb18b205f89cb6708f97f451b43ad5ece4197.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions