diff options
author | Dmitry Stogov <dmitry@zend.com> | 2014-08-15 08:10:08 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2014-08-15 08:10:08 +0400 |
commit | 8b66d64b2343bc4fd8aeabb690024edb850a0155 (patch) | |
tree | bd64ff35b4d598dc7e0252347ef538709fe2c333 /ext/standard/metaphone.c | |
parent | 6463bc5b55f6c771d5253cbc877725b5f5cec23a (diff) | |
parent | e9dac4cf71af3af131e75bf57aba1635f10ba82e (diff) | |
download | php-git-POST_PHPNG_MERGE.tar.gz |
Merge branch 'master' into phpngPOST_PHPNG_MERGE
* master:
add NEWS for 5.6 too
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
fix test
split the glob() test to test different basedir
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()
Add NEWS entry for log() improvements
Diffstat (limited to 'ext/standard/metaphone.c')
0 files changed, 0 insertions, 0 deletions