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-01-20 22:51:33 +04:00
2014-01-20 22:51:33 +04:00
2014-02-15 23:40:09 +04:00
2014-01-20 22:51:33 +04:00
2014-03-16 20:07:05 +04:00
2014-03-06 03:26:21 +04:00
2014-04-14 16:08:02 +04:00