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

..

bgfg_segm.cpp

fixes

2014-01-24 13:37:19 +04:00

camshift.cpp

converted CPU-based example to T-API (Mat 2 UMat, etc)

2013-12-30 03:19:17 +04:00

clahe.cpp

fixes

2014-01-24 13:37:19 +04:00

CMakeLists.txt

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

2014-02-03 13:23:59 +04:00

hog.cpp

fixes

2014-01-24 13:37:19 +04:00

pyrlk_optical_flow.cpp

samples

2014-01-24 12:59:19 +04:00

squares.cpp

fixes

2014-01-24 13:37:19 +04:00

surf_matcher.cpp

fixes

2014-01-24 13:37:19 +04:00

tvl1_optical_flow.cpp

samples

2014-01-24 12:59:19 +04:00