summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2015-02-16 13:09:40 -0200
committerFelipe Pena <felipensp@gmail.com>2015-02-16 13:09:40 -0200
commit35a68c276dd7c12e52751cb66300e85355472e8d (patch)
tree95944986775a00079901f391d72296d24125d38d /ext/mysql/php_mysql.c
parentdbf7d525a5226adee586333ea9ffb1d61f8b5489 (diff)
downloadphp-git-35a68c276dd7c12e52751cb66300e85355472e8d.tar.gz
- Fix merge
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions