mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-08 16:19:36 -06:00
Resolve conflicts in favor of the upstream side where possible. Resolve a logical conflict in archive_windows.h where the upstream port to Watcom was done slightly differently from ours.