summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-03-03 10:56:11 +0300
committerDmitry Stogov <dmitry@zend.com>2015-03-03 10:56:11 +0300
commit143cc672827cd37d5bfa8e8626e9e0393e5dc061 (patch)
tree106827b66684c85f6eb1005cb9ba7f1142e2a629 /ext/mysql/php_mysql.h
parentdd50ed8a34d9d04c7f3b532e112be0453920c3a5 (diff)
parentc433f19a6b00037bd963eac7c993d8c316a285bb (diff)
downloadphp-git-143cc672827cd37d5bfa8e8626e9e0393e5dc061.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Added type checks Update NEWS Conflicts: NEWS ext/soap/php_encoding.c ext/soap/soap.c
Diffstat (limited to 'ext/mysql/php_mysql.h')
0 files changed, 0 insertions, 0 deletions