modules/ocl/perf/perf_color.cpp · 2087d4602b7f2ee5ca215d6e5c510d6dfac6df64 · submodule / opencv

Merge commit '' (PR #895 from 2.4) · 5e0e1fac

Roman Donchenko authored May 22, 2013

Conflicts:
	modules/ocl/CMakeLists.txt
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp

5e0e1fac

perf_color.cpp 3.46 KB

Replace perf_color.cpp