91e8d35ab8
Resolve conflicts by taking upstream side when possible and otherwise integrating the changes from both sides. Be carful in CMakeLists.txt where the OPENSSL code block that we modified previously has moved, and preserve our previous modifications in the new location. |
||
|---|---|---|
| .. | ||
| curl.h | ||
| curlbuild.h.cmake | ||
| curlrules.h | ||
| curlver.h | ||
| easy.h | ||
| mprintf.h | ||
| multi.h | ||
| stdcheaders.h | ||
| typecheck-gcc.h | ||