Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-LibArchive' into update-libarchive | Brad King | 2017-07-20 | 1 | -2/+2 |
| | | | | | * upstream-LibArchive: LibArchive 2017-07-09 (98a69539) | ||||
* | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2014-04-03 | 1 | -1/+1 |
| | | | | | | 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. | ||||
* | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2011-12-20 | 1 | -0/+156 |
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot. |