summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql/php_pdo_mysql_int.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-11-19 23:21:34 +0100
committerAnatol Belski <ab@php.net>2014-11-19 23:21:34 +0100
commit14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e (patch)
tree948e486d8550692e8ef4c63baf59a343cf073c93 /ext/pdo_mysql/php_pdo_mysql_int.h
parent0180912823c87d25e4d0ef96c4a060a4c1b71d75 (diff)
parentf7674519804dc7000a56ef9fe12c49461ff0333a (diff)
downloadphp-git-14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e.tar.gz
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: NEWS Fix #68355: Inconsistency in example php.ini comments NEWS Fixed bug #68452 php-fpm man page is oudated (-O) NEWS Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z) NEWS Fixed bug #68381 Set FPM log level earlier during init
Diffstat (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h')
0 files changed, 0 insertions, 0 deletions