Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 31 Jul 2018 18:35:00 +0000 (21:35 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 31 Jul 2018 18:35:00 +0000 (21:35 +0300)
1  2 
CMakeLists.txt
modules/core/include/opencv2/core/utility.hpp
modules/core/src/arithm.cpp
modules/core/src/system.cpp
modules/core/test/test_arithm.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/ts/include/opencv2/ts/ts_perf.hpp

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge