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
..
2012-10-17 21:42:09 +04:00
2013-03-22 22:14:50 +04:00
2013-03-22 22:14:50 +04:00
2013-03-13 17:26:56 +04:00
2013-03-13 17:26:56 +04:00
2012-10-17 15:57:49 +04:00
2013-06-27 19:43:05 +02:00
2012-10-17 15:57:49 +04:00
2013-06-19 15:25:37 +04:00
2012-10-17 15:57:49 +04:00
2013-06-13 16:11:39 +04:00
2013-07-03 19:53:21 +04:00
2013-02-01 16:54:00 +04:00
2013-06-13 11:16:33 +02:00
2010-05-11 17:44:00 +00:00
2013-06-18 07:02:09 +04:00
2013-06-18 06:59:52 +04:00
2013-06-18 07:02:09 +04:00
2013-06-28 12:21:52 +04:00
2013-06-27 15:47:37 +04:00
2013-03-22 22:14:40 +04:00
2013-03-22 22:14:47 +04:00
2013-04-01 15:24:35 +04:00
2013-07-22 18:38:57 +04:00
2012-10-17 15:57:49 +04:00
2013-07-03 19:53:21 +04:00
2013-06-25 03:35:30 -07:00
2013-06-11 21:17:31 +04:00
2012-10-17 15:57:49 +04:00
2013-07-16 11:52:41 +04:00
2013-04-08 17:10:31 +04:00
2013-03-22 22:14:50 +04:00
2013-03-22 22:14:50 +04:00
2013-02-25 15:04:17 +04:00
2013-02-25 15:04:17 +04:00
2013-04-01 15:24:35 +04:00
2013-02-25 15:04:17 +04:00
2013-04-01 15:24:35 +04:00
2013-02-25 15:04:17 +04:00
2013-05-21 17:19:23 +04:00
2013-02-25 15:04:17 +04:00
2013-05-21 17:19:23 +04:00
2013-02-25 15:04:17 +04:00
2013-03-22 22:14:50 +04:00
2013-03-22 22:14:50 +04:00
2013-02-25 15:04:17 +04:00
2013-02-25 15:04:17 +04:00
2013-03-22 22:14:50 +04:00
2013-03-22 22:14:50 +04:00
2013-07-13 14:09:37 +04:00
2013-07-13 14:09:37 +04:00
2013-03-11 11:51:38 +04:00
2013-06-28 13:26:54 +04:00
2013-03-22 22:14:50 +04:00
2010-05-11 17:44:00 +00:00
2013-07-03 19:53:21 +04:00
2013-04-01 15:24:35 +04:00
2012-10-17 15:57:49 +04:00
2012-10-17 15:57:49 +04:00
2013-02-25 15:04:17 +04:00
2013-04-08 13:29:04 +04:00
2013-07-03 19:53:21 +04:00
2013-06-06 11:15:00 +01:00
2010-07-16 09:12:15 +00:00
2013-04-01 15:24:35 +04:00
2013-06-19 15:25:37 +04:00