| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2015-10-21 | 1 | -4/+4 |
| | | | | | Resolve conflicts by integrating changes from both sides. | ||||
| * | Merge branch 'libarchive-upstream' into update-libarchive | Brad King | 2013-07-31 | 1 | -0/+459 |
| Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive.h Utilities/cmlibarchive/libarchive/archive_entry.h Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c Utilities/cmlibarchive/libarchive/archive_windows.h Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c | |||||
 |
index : CMake.git | |
| CMake is a cross-platform, open-source build system generator. |
| summaryrefslogtreecommitdiffstats |