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
..
core	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-22 18:38:57 +04:00
core.hpp	Add missed constants for reduce operation	2013-04-12 14:37:02 +04:00