Roman Donchenko
4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
2013-08-27 13:23:26 +04:00
..
2013-08-13 12:56:39 +04:00
2012-10-17 15:32:23 +04:00
2012-08-28 13:45:35 +04:00
2013-02-25 22:02:24 +04:00
2013-04-09 13:36:32 +04:00
2013-08-19 19:02:36 +04:00
2013-08-21 07:24:46 -07:00
2013-04-03 14:10:03 +04:00
2013-04-01 15:24:34 +04:00
2013-02-11 14:58:38 +04:00
2013-07-16 12:25:26 +04:00
2013-04-01 19:18:05 +04:00
2013-04-10 19:39:38 +04:00