summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorDaniel Lowrey <rdlowrey@php.net>2014-08-07 12:39:52 -0400
committerDaniel Lowrey <rdlowrey@php.net>2014-08-07 12:39:52 -0400
commitdc53eba23b010187c6873fc5bc8313f3ac38af87 (patch)
tree20a15e8f32cc3549e9731942cffc865c6aaabc0d /ext/mysql/php_mysql.c
parent98e67add15a6b889efe152c23ed15a61f022a63a (diff)
parenta04c5536bb2aa06a773a753da3eba5fd5010c5cd (diff)
downloadphp-git-dc53eba23b010187c6873fc5bc8313f3ac38af87.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Update NEWS Update NEWS
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions