opencv/modules/cudaoptflow
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
..
doc fixed docs 2013-09-02 14:00:44 +04:00
include/opencv2 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf Merge commit '05b9c991dd' into merge-2.4 2013-12-30 17:30:59 +04:00
src Merge branch 'master' into gpu-cuda-rename 2013-09-04 09:58:32 +04:00
test removed precomp.cpp files 2013-09-02 14:00:44 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00