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-01-27	1	-7/+18
\| \| \| \| \|	* upstream-curl: curl 2022-12-21 (c12fb3dd)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2022-10-31	1	-1/+30
\| \| \| \| \|	* upstream-curl: curl 2022-10-26 (cd95ee9f)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2022-04-28	1	-2/+2
\| \| \| \| \|	* upstream-curl: curl 2022-04-27 (1669b17d)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2021-05-27	1	-16/+24
\| \| \| \| \|	* upstream-curl: curl 2021-05-26 (6b951a69)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2021-02-03	1	-44/+49
\| \| \| \| \|	* upstream-curl: curl 2021-02-03 (2f33be81)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-12-09	1	-20/+10
\| \| \| \| \|	* upstream-curl: curl 2020-12-09 (e0528597)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-07-01	1	-1/+1
\| \| \| \| \|	* upstream-curl: curl 2020-06-30 (5a1fc8d3)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-06-24	1	-4/+2
\| \| \| \| \|	* upstream-curl: curl 2020-06-23 (e9db32a0)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2020-03-04	1	-3/+5
\| \| \| \| \|	* upstream-curl: curl 2020-03-04 (b8d13668)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2019-05-22	1	-14/+15
\| \| \| \| \|	* upstream-curl: curl 2019-05-22 (885ce314)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2018-10-31	1	-17/+16
\| \| \| \| \|	* upstream-curl: curl 2018-10-30 (19667715)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2018-10-22	1	-6/+6
\| \| \| \| \|	* upstream-curl: curl 2018-09-04 (432eb5f5)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2018-05-18	1	-63/+7
\| \| \| \| \|	* upstream-curl: curl 2018-05-15 (cb013830)
*	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	-18/+24
\| \| \| \| \|	* upstream-curl: curl 2017-10-04 (3ea76790)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2017-06-14	1	-13/+11
\| \| \| \| \| \| \| \| \|	* upstream-curl: curl 2017-06-14 (54b636f1) Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt` by disabling CA bundle/path detection for build within CMake. CMake already handles locating a CA bundle/path at runtime.
*	Merge branch 'upstream-curl' into update-curl	Brad King	2017-05-11	1	-5/+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-12-05	1	-5/+6
\| \| \| \| \|	* upstream-curl: curl 2016-11-02 (3c561c65)
*	Merge branch 'upstream-curl' into update-curl	Brad King	2016-08-03	1	-41/+52
\| \| \| \| \|	* upstream-curl: curl 2016-08-03 (f2cb3a01)
*	Merge branch 'curl-upstream' into update-curl	Brad King	2015-08-12	1	-30/+33
\| \| \| \| \| \| \|	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.
*	Merge branch 'curl-upstream' into update-curl	Brad King	2014-10-29	1	-106/+282
\| \| \| \| \|	Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.
*	curl: Move sources back into upstream layout	Brad King	2014-10-29	1	-0/+407
	Update our build files as needed to compensate.