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	2020-02-13	1	-2/+3
\| \| \| \| \| \| \| \| \| \|	* 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 'libarchive-upstream' into update-libarchive	Brad King	2015-10-21	1	-0/+47
	Resolve conflicts by integrating changes from both sides.