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	2023-10-16	1	-0/+9
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2023-09-12 (6468cd1f)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2022-02-15	1	-1/+13
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2022-02-09 (9147def1)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2021-08-24	1	-1/+2
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2020-12-26 (227a4b97)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2020-02-13	1	-29/+256
\| \| \| \| \| \| \| \| \| \|	* upstream-LibArchive: LibArchive 2020-02-11 (3288ebb0) Also manually restore content from upstream libarchive's main `CMakeLists.txt` file that was removed by previous commits and exclude it with `IF(0)` blocks. Do this as an evil merge so that `git blame -C` can follow the content to upstream.
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2016-06-20	1	-1/+1
\| \| \| \| \|	* upstream-LibArchive: LibArchive 2016-06-19 (139d0576)
*	Merge branch 'upstream-LibArchive' into update-libarchive	Brad King	2016-05-02	1	-8/+9
\| \| \| \| \|	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	-0/+42
\| \| \| \|	Resolve conflicts by integrating changes from both sides.
*	Fix wording of "the the" typos throughout text	Ruslan Baratov	2014-01-03	1	-1/+1
\|
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2013-07-31	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|	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
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2012-01-05	1	-1/+1
\| \| \| \| \| \|	Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive_windows.c
*	Merge branch 'libarchive-upstream' into update-libarchive	Brad King	2011-12-20	1	-0/+437
	Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot.