summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-04-01 10:13:38 +0200
committerAnatol Belski <ab@php.net>2014-04-01 10:13:38 +0200
commitef6538875f838bb38f73afedc21ab5cb6697a29e (patch)
tree91f02643d508e3012616f50ea5cad48d535fd015 /ext/mysql/php_mysql.c
parente265df460d4829492c1eab69723c0f2dc31c809e (diff)
parent8e238148f95c23ff2fc160a6bd01b8268a3191c3 (diff)
downloadphp-git-ef6538875f838bb38f73afedc21ab5cb6697a29e.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: updated NEWS updated NEWS added test for bug #53965 Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions