Merge branch 'kepler-optimization' into cuda-dev
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 27 Nov 2012 12:34:45 +0000 (16:34 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 27 Nov 2012 12:34:45 +0000 (16:34 +0400)
commitd2591704e8bd1300b64aa052380c5e2342b84dc8
tree8e32f970f72796c2683779d0285cb791b0ee4122
parent22b0ea1cf0f620bc51aab9278252aeb9420350df
parent2eca75ccdd04f66e5be10acab20e62fbc4b90f84
Merge branch 'kepler-optimization' into cuda-dev
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/cuda/bf_knnmatch.cu