]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6463bc5 e9dac4c)
Merge branch 'master' into phpng POST_PHPNG_MERGE
authorDmitry Stogov <dmitry@zend.com>
Fri, 15 Aug 2014 04:10:08 +0000 (08:10 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 15 Aug 2014 04:10:08 +0000 (08:10 +0400)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.