Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2015-10-21 | 1 | -0/+47 |
Resolve conflicts by integrating changes from both sides. |
index : CMake.git | ||
CMake is a cross-platform, open-source build system generator. |
summaryrefslogtreecommitdiffstats |
Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2015-10-21 | 1 | -0/+47 |
Resolve conflicts by integrating changes from both sides. |