e9bc469b2a
Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes. |
||
|---|---|---|
| .. | ||
| CheckFileOffsetBits.c | ||
| CheckFileOffsetBits.cmake | ||
| CheckFuncs.cmake | ||
| CheckFuncs_stub.c.in | ||
| CheckHeaderDirent.cmake | ||
| CheckStructMember.cmake | ||
| CheckTypeExists.cmake | ||
| CreatePkgConfigFile.cmake | ||
| FindLZMA.cmake | ||
| FindLibGCC.cmake | ||
| FindNettle.cmake | ||
| FindPCREPOSIX.cmake | ||
| LibarchiveCodeCoverage.cmake | ||
| config.h.in | ||