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
..
2014-04-07 14:59:34 +04:00
2013-09-02 14:00:44 +04:00
2013-10-08 17:21:22 +04:00
2014-02-18 10:45:47 +04:00
2014-02-11 12:05:01 +04:00
2013-12-03 17:35:21 +04:00