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

..

gpu_perf.cpp

fix gpu::DeviceInfo compilation under linux

2013-06-24 10:11:44 +04:00

gpu_test.cpp

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

precomp.hpp

Merge commit '43aec5ad^' into merge-2.4

2013-08-27 13:23:26 +04:00

ts_arrtest.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

ts_func.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

ts_gtest.cpp

Extended Google Test to allow filtering by parameter value.

2013-06-27 13:14:37 +04:00

ts_perf.cpp

Merge commit '43aec5ad^' into merge-2.4

2013-08-27 13:23:26 +04:00

ts.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00