mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1c3bfae212
opencv/modules/nonfree
History
Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
..
doc fixed docs 2013-09-02 14:00:44 +04:00
include/opencv2 DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02:00
perf Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-23 18:50:17 +04:00
test DescriptorExtractor: added defaultNorm() to return default norm type. 2013-12-09 09:54:42 -02:00
CMakeLists.txt renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00