Roman Donchenko
799d2dabd6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
2014-04-14 16:08:02 +04:00
..
2014-03-20 13:03:03 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2011-07-12 18:43:41 +00:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2010-10-21 18:30:57 +00:00
2013-04-12 14:37:01 +04:00
2013-08-21 18:59:25 +04:00
2012-10-17 15:32:23 +04:00
2013-04-12 14:37:01 +04:00
2013-12-19 16:31:30 +04:00
2014-03-20 21:57:34 +04:00
2014-02-12 17:42:09 +04:00
2013-04-12 14:37:01 +04:00
2012-10-17 15:32:23 +04:00
2014-02-25 17:33:12 +04:00
2013-08-27 13:26:44 +04:00
2013-08-21 18:59:25 +04:00
2014-04-07 14:30:03 +04:00
2014-04-14 16:08:02 +04:00
2013-06-05 15:42:07 +04:00
2013-11-26 15:05:26 +04:00
2013-09-05 19:02:58 +04:00
2013-11-22 13:33:33 +01:00
2013-08-21 18:59:25 +04:00
2013-04-12 14:37:01 +04:00
2012-02-26 23:55:18 +00:00
2013-11-18 11:48:00 -05:00
2013-04-10 19:14:24 +04:00
2012-10-17 15:32:23 +04:00