summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_charset.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-11-30 17:07:02 -0800
committerStanislav Malyshev <stas@php.net>2014-11-30 17:07:02 -0800
commit60d5b2ec24625e399b862eb1dff92c32d54386c7 (patch)
treec657745c25cb36702f68b5797b0733053293d9f8 /ext/mysqlnd/mysqlnd_charset.c
parentf6aa6324fbfe981847926d3e048f83bd4b468704 (diff)
parent04808aa7e18ad0b2f6d014d06777b519e41dbccf (diff)
downloadphp-git-60d5b2ec24625e399b862eb1dff92c32d54386c7.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Added test and review suggestion Fix bug #68335: rmdir doesnt work with file:// stream wrapper
Diffstat (limited to 'ext/mysqlnd/mysqlnd_charset.c')
0 files changed, 0 insertions, 0 deletions