mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-15 01:39:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
265148b974
opencv/modules/cudaarithm
History
Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
..
doc fixed docs 2013-09-02 14:00:44 +04:00
include/opencv2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-03 13:45:22 +04:00
perf Merge commit '05b9c991dd' into merge-2.4 2013-12-30 17:30:59 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00