]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9eff1a2 76601c4)
Merge branch 'PHP-5.3' into PHP-5.4
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Fri, 12 Oct 2012 18:24:13 +0000 (20:24 +0200)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Fri, 12 Oct 2012 18:24:13 +0000 (20:24 +0200)
* PHP-5.3:
  Fix bug #63240 on stream_get_line()

1  2 
main/streams/streams.c patch | diff1 | diff2 | blob | history

diff --cc main/streams/streams.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.