Roman Donchenko 5e0e1fac87 Merge commit 'b51a1a7d' (PR #895 from 2.4) ...

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

2013-05-22 18:28:28 +04:00

..

doc

Add some documentation on ocl::convolve

2013-04-08 17:15:52 +08:00

include/opencv2

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

perf

Merge commit 'b51a1a7d' (PR #895 from 2.4)

2013-05-22 18:28:28 +04:00

src

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test

Merge commit 'b51a1a7d' (PR #895 from 2.4)

2013-05-22 18:28:28 +04:00

CMakeLists.txt

add accuracy tests while running perf

2013-05-17 13:18:46 +08:00