Roman Donchenko 4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 ... Conflicts: modules/contrib/src/inputoutput.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpuarithm/perf/perf_element_operations.cpp modules/gpuarithm/src/element_operations.cpp modules/ts/src/precomp.hpp		2013-08-27 13:23:26 +04:00
..
perf_arithm.cpp	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +04:00
perf_core.cpp
perf_element_operations.cpp
perf_main.cpp
perf_precomp.cpp
perf_precomp.hpp
perf_reductions.cpp