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
..
2013-07-22 18:38:57 +04:00
2013-05-06 22:45:11 -04:00
2013-04-10 19:14:24 +04:00
2013-07-16 11:52:41 +04:00
2013-06-13 12:01:59 +04:00
2013-06-05 15:42:07 +04:00
2013-04-10 19:14:24 +04:00
2013-03-22 22:14:50 +04:00
2013-04-10 19:14:24 +04:00
2012-10-10 13:24:49 +04:00
2012-10-17 02:09:14 +04:00
2013-04-10 19:14:24 +04:00
2013-03-22 22:14:50 +04:00
2013-04-10 19:14:24 +04:00
2011-07-19 12:27:07 +00:00
2011-07-19 12:27:07 +00:00
2011-07-19 12:27:07 +00:00
2013-04-05 21:11:59 +04:00
2013-05-06 22:45:11 -04:00
2013-05-06 22:45:11 -04:00
2013-04-10 19:14:24 +04:00
2010-05-11 17:44:00 +00:00
2013-04-10 19:14:24 +04:00
2013-04-10 19:14:24 +04:00