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	2017-05-11	1	-1/+1
\| \| \| \| \| \| \| \|	* 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	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/+63
	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.