summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/php_mysqlnd.c
diff options
context:
space:
mode:
authorTjerk Meesters <datibbaw@php.net>2014-04-09 20:11:07 +0800
committerTjerk Meesters <datibbaw@php.net>2014-04-09 20:11:07 +0800
commit16ae4727696b29c9e3d2711be07be4f30be0bc6c (patch)
tree684823556d2a326d96080c27102d7d86021f2c56 /ext/mysqlnd/php_mysqlnd.c
parentad2ef3d97edab0d0ce034e65b7e3da1a38cc15dd (diff)
parent287790d5c83d0b23f5703fcb7c7640ef0548a64a (diff)
downloadphp-git-16ae4727696b29c9e3d2711be07be4f30be0bc6c.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions