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-17 10:42:19 +04:00
2014-04-08 14:49:20 +04:00
2014-04-08 14:49:20 +04:00
2014-04-08 14:49:20 +04:00
2014-01-18 01:31:33 +04:00
2014-04-14 16:08:02 +04:00
2013-08-27 13:26:44 +04:00
2014-01-14 11:53:59 +04:00
2014-02-23 20:21:08 +04:00
2014-01-17 13:01:12 +04:00
2014-02-25 17:33:12 +04:00
2013-08-21 18:59:25 +04:00
2014-02-23 20:21:08 +04:00
2014-04-08 14:49:20 +04:00
2014-04-08 14:49:20 +04:00
2014-01-15 15:08:09 +04:00
2013-08-27 14:23:26 +04:00
2013-04-11 21:00:17 +04:00
2013-08-27 13:26:44 +04:00
2013-08-27 13:26:44 +04:00
2014-04-08 14:49:20 +04:00
2014-04-08 14:49:20 +04:00
2014-02-23 20:21:08 +04:00
2014-04-08 14:49:20 +04:00
2014-02-23 20:21:08 +04:00