Merge pull request #1909 from alalek:ocl_tapi_perf

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Wed, 4 Dec 2013 07:35:10 +0000 (11:35 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Wed, 4 Dec 2013 07:35:11 +0000 (11:35 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 4 Dec 2013 07:35:10 +0000 (11:35 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Wed, 4 Dec 2013 07:35:11 +0000 (11:35 +0400)
diff --cc modules/imgproc/test/ocl/test_warp.cpp
Simple merge
diff --cc modules/ts/include/opencv2/ts/ocl_test.hpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Wed, 4 Dec 2013 07:35:10 +0000 (11:35 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Wed, 4 Dec 2013 07:35:11 +0000 (11:35 +0400)
		1	2
modules/imgproc/test/ocl/test_warp.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/ocl_test.hpp	patch \|	diff1 \|	diff2 \|	blob \| history