mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
f610c295f2
opencv/modules/features2d
History
Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
..
doc Merge pull request #1881 from pentschev:defaultNorm_master 2013-12-17 13:53:59 +04:00
include/opencv2 Merge pull request #1881 from pentschev:defaultNorm_master 2013-12-17 13:53:59 +04:00
perf Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
test DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02:00
CMakeLists.txt Normalized file endings. 2013-08-21 18:59:25 +04:00