2 Commits

Author	SHA1	Message	Date
Brad King	e9bc469b2a	Merge branch 'upstream-LibArchive' into update-libarchive ... Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.	2016-05-02 10:48:48 -04:00
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