Merge pull request #12977 from weixiaowilliam/crc32c_opt

author Kefu Chai <tchaikov@gmail.com>

Sat, 18 Feb 2017 09:13:50 +0000 (17:13 +0800)

committer GitHub <noreply@github.com>

Sat, 18 Feb 2017 09:13:50 +0000 (17:13 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 18 Feb 2017 09:13:50 +0000 (17:13 +0800)
committer GitHub <noreply@github.com>
Sat, 18 Feb 2017 09:13:50 +0000 (17:13 +0800)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/include/config-h.in.cmake
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 18 Feb 2017 09:13:50 +0000 (17:13 +0800)
committer	GitHub <noreply@github.com>
	Sat, 18 Feb 2017 09:13:50 +0000 (17:13 +0800)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/config-h.in.cmake	patch \|	diff1 \|	diff2 \|	blob \| history