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
2013-08-13 12:56:39 +04:00
2013-08-19 19:02:36 +04:00
2013-08-27 13:23:26 +04:00
2013-08-27 13:23:26 +04:00
2013-08-19 14:26:12 +04:00
2013-08-19 19:02:36 +04:00
2013-08-19 19:02:36 +04:00
2013-08-21 16:18:31 +04:00
2013-08-27 13:23:26 +04:00
2013-08-20 18:04:54 +04:00
2013-08-20 14:10:22 +04:00
2013-08-19 15:56:45 +04:00
2013-08-19 12:46:57 +04:00
2013-08-19 15:56:45 +04:00
2013-08-19 12:46:57 +04:00
2013-08-19 15:56:45 +04:00
2013-08-19 12:46:57 +04:00
2013-08-19 12:46:57 +04:00
2013-08-22 18:17:19 +04:00
2013-08-19 19:02:36 +04:00
2013-08-27 13:23:26 +04:00
2013-08-19 19:02:36 +04:00
2013-08-19 19:02:36 +04:00
2013-08-20 14:10:22 +04:00
2013-08-21 16:06:31 +04:00
2013-08-22 23:37:06 +04:00
2013-07-30 04:14:36 +03:00
2013-08-20 14:10:22 +04:00
2013-08-23 18:46:54 +04:00
2013-08-19 15:56:45 +04:00
2013-08-19 19:02:36 +04:00
2013-08-20 18:04:54 +04:00
2013-08-27 13:23:26 +04:00
2013-08-19 19:02:36 +04:00
2013-08-19 19:02:36 +04:00
2013-08-19 19:02:36 +04:00
2013-06-10 18:18:01 +04:00
2012-05-30 14:06:47 +00:00