mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
36,246 Commits 2 Branches 401 Tags
d4f5d35ca491ede92003b26a7d0eb06aea3a2bbb
Commit Graph

3 Commits

Author SHA1 Message Date
Brad King a59a7ee956 Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2017-02-19 (100ee75a)
 2017-02-20 08:04:00 -05:00
Brad King 2f1978632b Merge branch 'libarchive-upstream' into update-libarchive 
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.
 2014-04-03 15:02:49 -04:00
Brad King 102071f80c Merge branch 'libarchive-upstream' into update-libarchive 
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
 2013-07-31 08:19:13 -04:00