2 Commits

Author	SHA1	Message	Date
Brad King	932848f420	Merge branch 'libarchive-upstream' into update-libarchive ... Resolve conflicts by integrating changes from both sides.	2015-10-21 10:18:52 -04:00
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