Roman Donchenko cdc10defa3 Merge commit '05b9c991dd' into merge-2.4 ...

Conflicts:
	modules/cuda/test/test_objdetect.cpp
	modules/gpu/perf/perf_core.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpu/test/test_core.cpp

2013-12-30 17:30:59 +04:00

7.4 KiB

Raw Blame History

View Raw