Roman Donchenko
4f2b126b7b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/core/src/out.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/generalized_hough.cpp
modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +04:00
..
2012-10-17 15:32:23 +04:00
2012-03-30 12:19:25 +00:00
2012-10-22 20:33:14 +04:00
2012-10-17 15:32:23 +04:00
2013-04-01 15:24:32 +04:00
2013-08-27 13:26:44 +04:00
2013-04-11 21:00:17 +04:00
2010-05-11 17:44:00 +00:00
2012-10-17 15:32:23 +04:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00
2012-10-17 15:32:23 +04:00
2014-02-25 15:02:24 +04:00
2014-01-07 02:52:30 +04:00
2013-08-21 18:59:25 +04:00
2014-03-31 19:57:05 +04:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00
2014-01-18 01:31:33 +04:00
2014-01-18 01:31:33 +04:00
2014-01-18 01:31:33 +04:00
2014-01-18 01:31:33 +04:00
2014-01-18 01:31:33 +04:00
2014-01-18 01:31:33 +04:00
2014-01-18 01:31:33 +04:00
2014-01-18 01:31:33 +04:00
2013-08-27 13:26:44 +04:00
2012-06-12 14:46:12 +00:00
2014-01-18 01:31:33 +04:00
2013-08-21 18:59:25 +04:00
2013-08-27 13:26:44 +04:00
2013-04-01 15:24:34 +04:00
2013-04-11 17:38:33 +04:00
2014-03-02 21:04:17 +04:00
2013-04-11 21:00:17 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2013-04-16 12:00:02 +04:00
2013-04-01 15:24:35 +04:00
2013-08-21 18:59:25 +04:00
2012-10-17 15:32:23 +04:00
2013-09-10 18:05:23 +04:00
2013-04-01 15:24:35 +04:00
2013-10-22 14:05:15 +04:00
2012-10-17 15:32:23 +04:00
2014-01-18 01:31:33 +04:00
2014-01-18 01:31:33 +04:00
2014-03-03 13:45:22 +04:00
2013-08-21 18:59:25 +04:00
2014-02-18 23:53:35 +04:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2014-01-18 01:31:33 +04:00
2013-10-22 14:05:15 +04:00
2012-03-30 12:19:25 +00:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00
2012-10-17 15:32:23 +04:00
2013-08-21 18:59:25 +04:00
2013-09-05 19:02:59 +04:00
2013-08-27 13:26:44 +04:00
2012-06-20 12:27:02 +00:00
2014-03-31 19:57:05 +04:00
2013-04-16 12:00:02 +04:00
2012-06-07 17:21:29 +00:00
2013-08-21 18:59:25 +04:00
2014-03-03 12:20:35 +04:00
2012-10-17 15:32:23 +04:00
2013-04-01 15:24:32 +04:00
2013-08-21 18:59:25 +04:00
2014-02-17 21:57:33 +04:00
2013-04-01 15:24:32 +04:00
2012-03-30 12:19:25 +00:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2014-02-17 21:57:33 +04:00
2013-07-10 16:02:07 +04:00
2010-05-11 17:44:00 +00:00
2013-04-01 15:24:35 +04:00
2013-02-15 17:28:23 +04:00
2013-04-01 15:24:32 +04:00
2013-04-01 15:24:35 +04:00
2012-10-17 15:32:23 +04:00
2013-02-25 15:04:17 +04:00
2013-04-01 15:24:33 +04:00
2013-08-27 13:26:44 +04:00
2013-08-21 18:59:25 +04:00
2014-03-03 13:45:22 +04:00
2014-01-14 11:53:59 +04:00
2013-08-21 18:59:25 +04:00