Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
..
2013-09-30 14:39:17 +04:00
2013-12-06 15:20:29 +04:00
2013-08-27 13:26:44 +04:00
2011-10-06 12:37:53 +00:00
2013-04-21 23:04:54 +04:00
2010-11-30 10:09:08 +00:00
2011-08-15 13:18:01 +00:00
2013-12-06 15:20:29 +04:00
2013-08-21 18:59:25 +04:00
2013-10-08 12:46:43 +04:00
2010-11-29 13:31:52 +00:00
2013-10-08 12:46:43 +04:00