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	2021-02-03	1	-16/+26
\| \| \| \| \|	* upstream-curl: curl 2021-02-03 (2f33be81)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-12-09	1	-1/+5
\| \| \| \| \|	* upstream-curl: curl 2020-12-09 (e0528597)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-06-24	1	-5/+4
\| \| \| \| \|	* upstream-curl: curl 2020-06-23 (e9db32a0)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-03-04	1	-3/+2
\| \| \| \| \|	* upstream-curl: curl 2020-03-04 (b8d13668)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2019-05-22	1	-3/+4
\| \| \| \| \|	* upstream-curl: curl 2019-05-22 (885ce314)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2018-01-24	1	-2/+2
\| \| \| \| \|	* upstream-curl: curl 2018-01-23 (d6c21c8e)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2017-10-10	1	-1/+1
\| \| \| \| \|	* upstream-curl: curl 2017-10-04 (3ea76790)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2017-05-11	1	-3/+3
\| \| \| \| \| \| \| \|	* upstream-curl: curl 2017-04-19 (d957e218) Resolve conflicts in `CMakeLists.txt` in favor of the upstream version. We will re-apply our logic as needed in following commits.
*	Merge branch 'upstream-curl' into update-curl	Brad King	2017-02-07	1	-1/+1
\| \| \| \| \|	* upstream-curl: curl 2016-12-22 (44b9b4d4)
*	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	2014-10-29	1	-0/+150
	Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.