summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorKeyur Govande <keyur@php.net>2014-07-30 02:47:44 +0000
committerKeyur Govande <keyur@php.net>2014-07-30 02:47:44 +0000
commit0e04d542e98c559b044c2a72a1f2b559b05f9702 (patch)
treeffa1a5178e6f0846c1a12a5c5ad0003f2107b0a8 /ext/mysql/php_mysql.c
parent0120a9ca4b8349f7484b274d235f1d03572196f3 (diff)
parentf0278589e1583855e04ee04bfe30ccef3e9ccda2 (diff)
downloadphp-git-0e04d542e98c559b044c2a72a1f2b559b05f9702.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Undo inadvertent commit of php_version Corrected patch for bug #60616
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions