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	2018-10-22	1	-4/+3
\| \| \| \| \|	* upstream-curl: curl 2018-09-04 (432eb5f5)
*	Merge branch 'curl-upstream' into update-curl	Brad King	2015-08-12	1	-1/+1
\| \| \| \| \| \| \|	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.
*	curl: Remove unused SIZEOF_LONG_DOUBLE	Brad King	2014-10-29	1	-3/+0
\| \| \| \| \|	Re-apply change from commit v2.8.2~537 (cmcurl: Remove unused SIZEOF_LONG_DOUBLE, 2009-12-17) on updated upstream curl.
*	Merge branch 'curl-upstream' into update-curl	Brad King	2014-10-29	1	-0/+125
	Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.