Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 17 Apr 2013 08:07:17 +0000 (12:07 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 17 Apr 2013 08:07:17 +0000 (12:07 +0400)
commit8fdab9f631381ad45986c43f48bdb6f533dba541
tree887604ea12d35d19a68069552d214d67505ef837
parent974f1f48957d996d6ab6dc9988c78aa4152e4940
parentf6848b66d693e28dd55fa4de1e534a31d8b44b77
Merge branch '2.4'
20 files changed:
modules/features2d/perf/perf_fast.cpp
modules/gpu/perf/perf_core.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_optflow.cpp
modules/imgproc/perf/perf_blur.cpp
modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp
modules/imgproc/perf/perf_cornerHarris.cpp
modules/imgproc/perf/perf_cvt_color.cpp
modules/imgproc/perf/perf_filter2d.cpp
modules/imgproc/perf/perf_matchTemplate.cpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/brute_force_matcher.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/opencl/brute_force_match.cl
modules/ocl/test/test_brute_force_matcher.cpp
modules/ocl/test/utility.hpp
modules/ts/include/opencv2/ts/gpu_perf.hpp
modules/ts/include/opencv2/ts/gpu_test.hpp
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/video/perf/perf_optflowpyrlk.cpp