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
|
8f837fc9a9
|
libarchive: Use CommonCrypto APIs on OS X only when available
Use each CommonCrypto API only when using an OS X SDK version new enough
to provide it.
|
2015-10-22 10:18:26 -04:00 |
|
Brad King
|
0b82f51a30
|
libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H
|
2015-10-21 11:18:50 -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 |