]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e4cef1 bb3d43f)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 14 Oct 2014 18:43:34 +0000 (11:43 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 14 Oct 2014 18:43:34 +0000 (11:43 -0700)
* PHP-5.5:
  Fix return code (merges are hard :( )

1  2 
ext/curl/interface.c patch | diff1 | diff2 | blob | history

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