]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce89bc8 731a5c5)
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 2 Apr 2013 14:31:45 +0000 (16:31 +0200)
committerRemi Collet <remi@php.net>
Tue, 2 Apr 2013 14:31:45 +0000 (16:31 +0200)
* PHP-5.4:
  keep previous test to avoid any behavior change

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.