Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/retina.cpp modules/gpu/perf/perf_video.cpp modules/gpuoptflow/src/tvl1flow.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_calib3d.cpp modules/ocl/perf/perf_color.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/precomp.hpp samples/gpu/stereo_multi.cpp		2013-09-02 19:44:51 +04:00
..
perf_abs.cpp
perf_addWeighted.cpp
perf_arithm.cpp
perf_bitwise.cpp
perf_compare.cpp
perf_convertTo.cpp
perf_dft.cpp
perf_dot.cpp
perf_inRange.cpp
perf_main.cpp
perf_mat.cpp
perf_math.cpp
perf_merge.cpp
perf_minmaxloc.cpp
perf_norm.cpp
perf_precomp.hpp
perf_reduce.cpp
perf_split.cpp
perf_stat.cpp