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
..
doc	PyDocs for common interface of feature2d	2013-07-11 09:33:32 +05:30
include/opencv2	drawMatches python bindings	2013-07-11 09:28:37 +05:30
perf	Merge branch '2.4'	2013-04-17 12:07:17 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-22 18:38:57 +04:00
test	Move border type constants and Moments class to core module	2013-04-10 19:14:24 +04:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00