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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
include/opencv2	replaced GPU -> CUDA	2013-09-02 14:00:44 +04:00
perf	moved BufferPool management functions to public	2013-10-08 17:21:22 +04:00
src	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
test	Merge commit '05b9c991dd' into merge-2.4	2013-12-30 17:30:59 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00