Roman Donchenko 2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/cudaimgproc/test/test_color.cpp modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/imgproc.cpp modules/gpu/test/test_core.cpp modules/gpu/test/test_imgproc.cpp modules/java/generator/src/cpp/VideoCapture.cpp samples/gpu/performance/CMakeLists.txt samples/tapi/CMakeLists.txt		2014-02-03 13:23:59 +04:00
..
main_nvidia.cpp
main_test_nvidia.h
NCVAutoTestLister.hpp
NCVTest.hpp
NCVTestSourceProvider.hpp
test_main.cpp
test_nvidia.cpp	replaced GPU -> CUDA	2013-09-02 14:00:44 +04:00
test_precomp.hpp
TestCompact.cpp
TestCompact.h
TestDrawRects.cpp
TestDrawRects.h
TestHaarCascadeApplication.cpp
TestHaarCascadeApplication.h
TestHaarCascadeLoader.cpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-03 13:23:59 +04:00
TestHaarCascadeLoader.h
TestHypothesesFilter.cpp
TestHypothesesFilter.h
TestHypothesesGrow.cpp
TestHypothesesGrow.h
TestIntegralImage.cpp
TestIntegralImage.h
TestIntegralImageSquared.cpp
TestIntegralImageSquared.h
TestRectStdDev.cpp
TestRectStdDev.h
TestResize.cpp
TestResize.h
TestTranspose.cpp
TestTranspose.h