mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
eb2720a908
opencv/modules/ts
History
Roman Donchenko 3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
..
include/opencv2 Merge pull request #1122 from SpecLad:merge-2.4 2013-07-21 18:46:27 +04:00
misc Fix xls-report.py not working with more than one comparison. 2013-07-22 12:48:43 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-22 18:38:57 +04:00
CMakeLists.txt Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00