]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e04971c 52b41f2)
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Wed, 3 Dec 2014 23:22:54 +0000 (07:22 +0800)
committerTjerk Meesters <datibbaw@php.net>
Wed, 3 Dec 2014 23:22:54 +0000 (07:22 +0800)
* PHP-5.6:
  Fixed #65213 - cannot cast SplFileInfo to boolean

Conflicts:
ext/spl/spl_directory.c


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