Merge pull request #9763 from dx9/wip-pthread-np

author Kefu Chai <tchaikov@gmail.com>

Mon, 11 Jul 2016 03:46:47 +0000 (11:46 +0800)

committer GitHub <noreply@github.com>

Mon, 11 Jul 2016 03:46:47 +0000 (11:46 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 11 Jul 2016 03:46:47 +0000 (11:46 +0800)
committer GitHub <noreply@github.com>
Mon, 11 Jul 2016 03:46:47 +0000 (11:46 +0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/client/SyntheticClient.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 11 Jul 2016 03:46:47 +0000 (11:46 +0800)
committer	GitHub <noreply@github.com>
	Mon, 11 Jul 2016 03:46:47 +0000 (11:46 +0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/SyntheticClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history