summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-02-20 17:48:38 +0100
committerBob Weinand <bobwei9@hotmail.com>2014-02-20 17:48:38 +0100
commitca313caa4bb84d86c4f0b37493791fe27ee869af (patch)
tree279f50338922dae7ad9dd236d0a2bae324b3619c /ext/mysql/php_mysql.c
parent143bb29c1ac3f959f44b8fe59adef4d1840bc393 (diff)
parentafa03a470ef90a53f2b59a8175f77afdb6b5a651 (diff)
downloadphp-git-ca313caa4bb84d86c4f0b37493791fe27ee869af.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions