StevenPuttemans
|
edb608d206
|
fix documentation bug 2432
|
2014-12-15 11:53:55 +01:00 |
|
Maksim Shabunin
|
1523fdcc1c
|
Doxygen documentation: more fixes and cleanups
|
2014-12-01 15:50:36 +03:00 |
|
Maksim Shabunin
|
ceb6e8bd94
|
Doxygen documentation: cuda
|
2014-12-01 15:47:13 +03:00 |
|
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 |
|
Vladislav Vinogradov
|
dcd600cc47
|
renamed gpuarithm -> cudaarithm
|
2013-09-02 14:00:42 +04:00 |
|