Merge pull request #55 from vpisarev/ocl_fixes

author Andrey Kamaev <andrey.kamaev@itseez.com>

Mon, 22 Oct 2012 12:39:09 +0000 (16:39 +0400)

committer Andrey Kamaev <andrey.kamaev@itseez.com>

Mon, 22 Oct 2012 12:40:18 +0000 (16:40 +0400)
author Andrey Kamaev <andrey.kamaev@itseez.com>
Mon, 22 Oct 2012 12:39:09 +0000 (16:39 +0400)
committer Andrey Kamaev <andrey.kamaev@itseez.com>
Mon, 22 Oct 2012 12:40:18 +0000 (16:40 +0400)
diff --cc modules/ocl/CMakeLists.txt
Simple merge
diff --cc modules/ocl/src/brute_force_matcher.cpp
Simple merge
author	Andrey Kamaev <andrey.kamaev@itseez.com>
	Mon, 22 Oct 2012 12:39:09 +0000 (16:39 +0400)
committer	Andrey Kamaev <andrey.kamaev@itseez.com>
	Mon, 22 Oct 2012 12:40:18 +0000 (16:40 +0400)
		1	2
modules/ocl/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/brute_force_matcher.cpp	patch \|	diff1 \|	diff2 \|	blob \| history