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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'upstream-curl' into update-curl	Brad King	2023-09-22	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \|	* upstream-curl: curl 2023-09-13 (6fa1d817) Upstream significantly refactored `lib/CMakeLists.txt`, so take the upstream version of everything except the code added by commit 54cb23c657 (curl: Restore installation of OpenSSL DLLs, 2014-11-03, v3.2.0-rc1~418^2~4). We will apply our customizations again in a follow-up commit.
*	Merge branch 'upstream-curl' into update-curl	Brad King	2023-02-21	1	-1/+1
\| \| \| \| \|	* upstream-curl: curl 2023-02-20 (046209e5)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2022-10-31	1	-0/+2
\| \| \| \| \|	* upstream-curl: curl 2022-10-26 (cd95ee9f)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2022-04-28	1	-3/+8
\| \| \| \| \|	* upstream-curl: curl 2022-04-27 (1669b17d)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-12-09	1	-2/+2
\| \| \| \| \|	* upstream-curl: curl 2020-12-09 (e0528597)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-03-04	1	-1/+1
\| \| \| \| \|	* upstream-curl: curl 2020-03-04 (b8d13668)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2016-08-03	1	-3/+3
\| \| \| \| \|	* upstream-curl: curl 2016-08-03 (f2cb3a01)
*	Merge branch 'curl-upstream' into update-curl	Brad King	2015-08-12	1	-0/+34
	Resolve conflicts by taking upstream side when possible and otherwise integrating the changes from both sides. Be carful in CMakeLists.txt where the OPENSSL code block that we modified previously has moved, and preserve our previous modifications in the new location.