Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
..
2013-08-27 14:23:26 +04:00
2013-08-27 13:26:44 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:29 +04:00
2013-08-27 13:26:44 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-08-27 14:39:43 +04:00
2010-06-10 07:59:18 +00:00
2010-10-16 07:10:46 +00:00
2010-10-09 11:36:06 +00:00
2013-08-21 18:59:25 +04:00
2012-06-20 16:03:03 +00:00
2013-04-12 14:37:01 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:28 +04:00
2012-10-17 15:57:49 +04:00
2013-04-12 14:37:01 +04:00
2013-04-11 17:38:33 +04:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2013-04-08 15:47:29 +04:00
2010-05-11 17:44:00 +00:00
2010-11-27 23:15:16 +00:00
2011-04-25 21:51:36 +00:00
2013-05-13 18:33:20 +04:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:29 +04:00
2013-04-11 17:38:33 +04:00
2013-03-20 17:56:06 +04:00
2013-08-14 23:36:29 +10:00
2013-04-08 15:47:29 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2010-06-02 05:19:09 +00:00
2013-04-08 15:47:28 +04:00
2010-05-11 17:44:00 +00:00
2013-04-08 15:47:28 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00
2013-04-12 14:37:01 +04:00
2010-05-11 17:44:00 +00:00
2013-04-01 15:24:34 +04:00
2010-05-11 17:44:00 +00:00
2010-05-11 17:44:00 +00:00