opencv/modules/ts
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
..
include/opencv2 added cvconfig.hpp header file to gpu tests 2013-08-19 12:46:57 +04:00
misc xls-report.py: separated image width and height for easier analysis. 2013-08-07 13:43:03 +04:00
src Merge commit '43aec5ad^' into merge-2.4 2013-08-27 13:23:26 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00