]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eb5661 7a24ee1)
Merge branch 'PHP-5.4' into PHP-5.5
authorDavid Soria Parra <dsp@php.net>
Wed, 18 Sep 2013 13:06:51 +0000 (15:06 +0200)
committerDavid Soria Parra <dsp@php.net>
Wed, 18 Sep 2013 13:06:51 +0000 (15:06 +0200)
* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"

1  2 
ext/spl/spl_iterators.c patch | diff1 | diff2 | blob | history

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