Merge pull request #2178 from Nerei:viz_backport

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Mon, 3 Feb 2014 12:16:50 +0000 (16:16 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Mon, 3 Feb 2014 12:16:51 +0000 (16:16 +0400)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 3 Feb 2014 12:16:50 +0000 (16:16 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 12:16:51 +0000 (16:16 +0400)
diff --cc CMakeLists.txt
Simple merge
diff --cc samples/cpp/CMakeLists.txt
Simple merge
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Mon, 3 Feb 2014 12:16:50 +0000 (16:16 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Mon, 3 Feb 2014 12:16:51 +0000 (16:16 +0400)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
samples/cpp/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history