Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-LibArchive' into update-libarchive | Brad King | 2017-02-20 | 1 | -2/+1 |
| | | | | | * upstream-LibArchive: LibArchive 2017-02-19 (100ee75a) | ||||
* | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2015-10-21 | 1 | -1/+20 |
| | | | | Resolve conflicts by integrating changes from both sides. | ||||
* | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2014-04-15 | 1 | -0/+137 |
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as appropriate. |