summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorTjerk Meesters <datibbaw@php.net>2014-04-09 07:34:49 +0800
committerTjerk Meesters <datibbaw@php.net>2014-04-09 07:34:49 +0800
commit2aba2494f5e9458760c8246ad1928074984a2766 (patch)
tree58f333d58a0d6cc8c03acfc592b5a6cbcf0916ab /ext/mysql/php_mysql.c
parent002c8e835691a5db26baf10fac9178e91afded10 (diff)
parent032921d80cd97d1d8a696348ce6bb0fd17e597e8 (diff)
downloadphp-git-2aba2494f5e9458760c8246ad1928074984a2766.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