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	last warnings solved	2013-06-13 07:36:37 +02:00
include/opencv2	updated demos and tutorial regarding the Retina class transfer to bioinspired module.	2013-06-12 22:43:36 +02:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-22 18:38:57 +04:00
test	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
CMakeLists.txt	Move cv::KeyPoint and cv::DMatch to core	2013-03-26 16:08:43 +04:00