Merge pull request #15069 from tchaikov/wip-inttypes-cleanup

author Yuri Weinstein <yuri.weinstein@gmail.com>

Tue, 16 May 2017 20:18:23 +0000 (13:18 -0700)

committer GitHub <noreply@github.com>

Tue, 16 May 2017 20:18:23 +0000 (13:18 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 16 May 2017 20:18:23 +0000 (13:18 -0700)
committer GitHub <noreply@github.com>
Tue, 16 May 2017 20:18:23 +0000 (13:18 -0700)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/include/config-h.in.cmake
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 16 May 2017 20:18:23 +0000 (13:18 -0700)
committer	GitHub <noreply@github.com>
	Tue, 16 May 2017 20:18:23 +0000 (13:18 -0700)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/config-h.in.cmake	patch \|	diff1 \|	diff2 \|	blob \| history