]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e16bb2 46aa2c3)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 29 Sep 2014 15:28:27 +0000 (17:28 +0200)
committerAnatol Belski <ab@php.net>
Mon, 29 Sep 2014 15:28:27 +0000 (17:28 +0200)
* PHP-5.5:
  increase the polling period to not to break existing behaviours

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

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