Merge pull request #3094 from chuckatkins:update-deprecated-cmake-version

author Derek Mauro <dmauro@google.com>

Mon, 28 Dec 2020 18:32:06 +0000 (13:32 -0500)

committer Derek Mauro <dmauro@google.com>

Mon, 28 Dec 2020 18:32:06 +0000 (13:32 -0500)
author Derek Mauro <dmauro@google.com>
Mon, 28 Dec 2020 18:32:06 +0000 (13:32 -0500)
committer Derek Mauro <dmauro@google.com>
Mon, 28 Dec 2020 18:32:06 +0000 (13:32 -0500)
diff --cc googlemock/CMakeLists.txt
Simple merge
diff --cc googletest/CMakeLists.txt
Simple merge
diff --cc googletest/README.md
Simple merge
author	Derek Mauro <dmauro@google.com>
	Mon, 28 Dec 2020 18:32:06 +0000 (13:32 -0500)
committer	Derek Mauro <dmauro@google.com>
	Mon, 28 Dec 2020 18:32:06 +0000 (13:32 -0500)
		1	2
googlemock/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
googletest/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
googletest/README.md	patch \|	diff1 \|	diff2 \|	blob \| history