summaryrefslogtreecommitdiff
path: root/ext/mssql/php_mssql.h
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2014-11-19 16:48:21 +0100
committerRemi Collet <remi@php.net>2014-11-19 16:48:21 +0100
commit4a36482378373aa5dc584213f100f92525f50eb4 (patch)
tree692f31ce5fba170b81f10165fb7ab0e92e43ff81 /ext/mssql/php_mssql.h
parentc40e665ecd32806c2b01e601867a788dd324dc1f (diff)
parentd438bcf2266ee1ddc56901fab65e022573874594 (diff)
downloadphp-git-4a36482378373aa5dc584213f100f92525f50eb4.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: 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/mssql/php_mssql.h')
0 files changed, 0 insertions, 0 deletions