CMake.git - CMake is a cross-platform, open-source build system generator.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2018-09-26	1	-2/+2
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2018-09-03 (5fe69dd0)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2017-02-20	1	-7/+7
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2017-02-19 (100ee75a)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2016-05-02	1	-1/+1
\| \| \| \| \|	Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2015-10-21	1	-2/+7
\| \| \| \|	Resolve conflicts by integrating changes from both sides.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2014-04-03	1	-1/+1
\| \| \| \| \| \|	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.
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2013-07-31	1	-0/+1841
	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