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	2024-04-05	1	-0/+1
\| \| \| \| \|	* upstream-curl: curl 2024-03-27 (de7b3e89)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2023-08-01	1	-197/+0
\| \| \| \| \|	* upstream-curl: curl 2023-07-26 (50490c06)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2023-02-21	1	-2/+2
\| \| \| \| \|	* upstream-curl: curl 2023-02-20 (046209e5)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2022-10-31	1	-2/+4
\| \| \| \| \|	* upstream-curl: curl 2022-10-26 (cd95ee9f)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2021-05-27	1	-3/+3
\| \| \| \| \|	* upstream-curl: curl 2021-05-26 (6b951a69)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-12-09	1	-7/+4
\| \| \| \| \|	* upstream-curl: curl 2020-12-09 (e0528597)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-06-24	1	-2/+1
\| \| \| \| \|	* upstream-curl: curl 2020-06-23 (e9db32a0)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2018-10-22	1	-0/+1
\| \| \| \| \|	* upstream-curl: curl 2018-09-04 (432eb5f5)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2018-01-24	1	-23/+10
\| \| \| \| \|	* upstream-curl: curl 2018-01-23 (d6c21c8e)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2016-08-03	1	-1/+1
\| \| \| \| \|	* upstream-curl: curl 2016-08-03 (f2cb3a01)
*	Merge branch 'curl-upstream' into update-curl	Brad King	2015-08-12	1	-0/+271
	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.