Merge commit '43aec5ad^' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 27 Aug 2013 09:23:26 +0000 (13:23 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 27 Aug 2013 09:23:26 +0000 (13:23 +0400)
commit4d06c4c7b6a46940cfc724d59e6e78670d96d0b1
treea35339ef77b6c29307cd162ea052838e557b81ef
parent0daac6fd9d5b62bdc7f73f675a255951b232c7d4
parent9c60a2c24c77101ddc775034bf1e1954be308b94
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
modules/contrib/src/inputoutput.cpp
modules/core/src/system.cpp
modules/gpuarithm/perf/perf_arithm.cpp
modules/gpuarithm/src/element_operations.cpp
modules/java/generator/gen_java.py
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp