]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4142a9 2fb7cd3)
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Tue, 8 Jan 2013 14:13:40 +0000 (15:13 +0100)
committerPierre Joye <pierre.php@gmail.com>
Tue, 8 Jan 2013 14:13:40 +0000 (15:13 +0100)
* PHP-5.4:
  - fix bug #47358, glob returns error, should be empty array()
  - NEWS entry for #50524

1  2 
ext/standard/dir.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/dir.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.