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-22 20:33:14 +04:00
2013-08-27 13:26:44 +04:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +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-04-01 15:24:34 +04:00
2014-03-02 21:04:17 +04:00
2013-08-21 18:59:25 +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
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
2013-08-21 18:59:25 +04:00
2013-09-05 19:02:59 +04:00
2013-08-27 13:26:44 +04:00
2014-03-31 19:57:05 +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
2014-02-17 21:57:33 +04:00
2013-04-01 15:24:32 +04:00
2012-10-17 15:32:23 +04:00
2014-02-17 21:57:33 +04:00
2013-04-01 15:24:33 +04:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00