mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
0b4534d4c9
opencv/modules/legacy
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 DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02:00
include/opencv2 some more changes 2014-02-17 21:57:33 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-03 13:45:22 +04:00
test Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
CMakeLists.txt Making all dependencies from highgui module optional 2012-06-26 07:29:36 +00:00