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)
1  2 
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/cuda/bf_knnmatch.cu

Simple merge
Simple merge