Merge pull request #328 from jet47:new-gpu-fixes

author cuda-geek <marina.kolpakova@itseez.com>

Tue, 29 Jan 2013 07:00:36 +0000 (11:00 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 29 Jan 2013 07:00:37 +0000 (11:00 +0400)
author cuda-geek <marina.kolpakova@itseez.com>
Tue, 29 Jan 2013 07:00:36 +0000 (11:00 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Jan 2013 07:00:37 +0000 (11:00 +0400)
diff --cc CMakeLists.txt
Simple merge
diff --cc modules/ts/include/opencv2/ts/ts.hpp
Simple merge
diff --cc modules/ts/src/ts_perf.cpp
Simple merge
author	cuda-geek <marina.kolpakova@itseez.com>
	Tue, 29 Jan 2013 07:00:36 +0000 (11:00 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 29 Jan 2013 07:00:37 +0000 (11:00 +0400)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/ts.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ts/src/ts_perf.cpp	patch \|	diff1 \|	diff2 \|	blob \| history