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
|
c70491d671
|
libarchive: Avoid using name 'hz'
AIX system headers define the symbol 'hz' as a preprocessor macro.
|
2015-10-22 10:18:27 -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 |