Merge commit '05b9c991dd' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 13:30:59 +0000 (17:30 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 13:30:59 +0000 (17:30 +0400)
commitcdc10defa34ea7ba0edda7d4a3fa0701d451912a
tree0b592765b7164693c5387c65f89b2fcc3f26d8d4
parente33759b358a113ad97dd89779cd3c2bed7e29465
parent05b9c991dd6a1309dfa9eda29685eaef43518ac4
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
modules/cuda/test/test_gpumat.cpp
modules/cuda/test/test_objdetect.cpp
modules/cudaarithm/perf/perf_arithm.cpp
modules/cudaarithm/test/test_element_operations.cpp
modules/cudaarithm/test/test_reductions.cpp
modules/cudaimgproc/test/test_color.cpp
modules/cudaoptflow/perf/perf_optflow.cpp