Brad King 2f1978632b Merge branch 'libarchive-upstream' into update-libarchive ...

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.

2014-04-03 15:02:49 -04:00

3.3 KiB

Raw Blame History

View Raw