]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fde041 b754e3e)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 8 Jun 2015 10:11:58 +0000 (12:11 +0200)
committerAnatol Belski <ab@php.net>
Mon, 8 Jun 2015 10:11:58 +0000 (12:11 +0200)
* PHP-5.5:
  updated NEWS
  Fix bug #67805 - SplFileObject setMaxLineLength.

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

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