mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 20:20:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
95c2e8b51f
opencv/modules/flann/include/opencv2
History
Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
..
flann Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
flann.hpp Make flann headers independent from OpenCV C API 2013-04-08 15:47:29 +04:00