modules/ocl/perf · 1d8e80aa3b34f29e3777aac99ab4007cabcb5314 · 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

Name	Last commit	Last update
..
main.cpp		Loading commit data...
perf_arithm.cpp		Loading commit data...
perf_blend.cpp		Loading commit data...
perf_brute_force_matcher.cpp		Loading commit data...
perf_canny.cpp		Loading commit data...
perf_color.cpp		Loading commit data...
perf_columnsum.cpp		Loading commit data...
perf_fft.cpp		Loading commit data...
perf_filters.cpp		Loading commit data...
perf_gemm.cpp		Loading commit data...
perf_haar.cpp		Loading commit data...
perf_hog.cpp		Loading commit data...
perf_hough.cpp		Loading commit data...
perf_imgproc.cpp		Loading commit data...
perf_match_template.cpp		Loading commit data...
perf_matrix_operation.cpp		Loading commit data...
perf_norm.cpp		Loading commit data...
perf_pyrdown.cpp		Loading commit data...
perf_pyrlk.cpp		Loading commit data...
perf_pyrup.cpp		Loading commit data...
perf_split_merge.cpp		Loading commit data...
precomp.cpp		Loading commit data...
precomp.hpp		Loading commit data...