Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
..
2013-12-03 17:35:21 +04:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2013-12-30 17:30:59 +04:00
2013-12-30 17:30:59 +04:00
2013-12-03 17:35:21 +04:00
2013-12-03 17:35:21 +04:00
2013-12-03 17:35:21 +04:00
2013-12-03 17:35:21 +04:00
2014-01-14 11:53:59 +04:00
2013-11-11 16:55:36 +04:00
2013-12-30 17:30:59 +04:00
2013-12-03 17:35:21 +04:00
2013-12-03 17:35:21 +04:00
2013-11-11 17:02:50 +04:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2013-12-30 16:36:35 +04:00
2014-01-14 11:53:59 +04:00
2013-10-24 18:20:16 +01:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2014-01-09 14:49:20 +08:00
2014-01-14 11:53:59 +04:00
2013-10-29 16:14:32 +04:00
2013-12-07 01:05:07 +04:00
2013-12-30 16:48:45 +04:00
2013-10-08 13:50:49 +04:00
2013-09-06 15:44:44 +04:00
2014-01-10 18:19:26 +04:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2014-01-14 11:53:59 +04:00
2013-12-23 11:34:46 +04:00
2013-12-07 20:33:50 +04:00
2013-11-11 16:55:36 +04:00
2013-06-10 18:18:01 +04:00