mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9cdd15e141
opencv/modules/features2d
History
Roman Donchenko 799d2dabd6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/test/test_arithm.cpp
	modules/cuda/src/cascadeclassifier.cpp
	modules/imgproc/doc/geometric_transformations.rst
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/moments.cpp
2014-04-14 16:08:02 +04:00
..
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-31 14:42:00 +04:00
include/opencv2 Merge pull request #1932 from seth-planet:master 2014-04-10 13:36:14 +04:00
perf Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb 2014-03-31 18:17:50 +04:00
src Merge pull request #1932 from seth-planet:master 2014-04-10 13:36:14 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-14 16:08:02 +04:00
CMakeLists.txt Normalized file endings. 2013-08-21 18:59:25 +04:00