summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorDerick Rethans <github@derickrethans.nl>2015-01-19 22:59:31 +0000
committerDerick Rethans <github@derickrethans.nl>2015-01-19 22:59:31 +0000
commit6f2f2ce5cf142ba1ec9e1b3d2365ec1665908b64 (patch)
tree0067c115d99d65c9504483510e5f84d629f5d12e /ext/mysql/php_mysql.c
parentac7cfad3b54b04b7ff2d0e4bfd26e8b61d233613 (diff)
parentb0159431e3363f6b15561c7dfa0cdb247c287223 (diff)
downloadphp-git-6f2f2ce5cf142ba1ec9e1b3d2365ec1665908b64.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