-
Brad King authored
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.
2f197863
A Gitlab security update will be applied on March 29th, between 8am and 10am, EST (UTC-05:00). This site may have intermittent delays during that time.
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.