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