Merge pull request #328 from jet47:new-gpu-fixes
authorcuda-geek <marina.kolpakova@itseez.com>
Tue, 29 Jan 2013 07:00:36 +0000 (11:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Jan 2013 07:00:37 +0000 (11:00 +0400)
commit11dfceb2c9b56ca9c6694eff665e6501b2f6344d
treef473830e80e6ec7231ada053504b0deb25e0e664
parent2b4ffd1161e08e141b6ea978f65771ba76d56d9f
parent395f0201e305d6381f31508bbae8094b4495c0b6
Merge pull request #328 from jet47:new-gpu-fixes
CMakeLists.txt
modules/ts/include/opencv2/ts/ts.hpp
modules/ts/src/ts_perf.cpp