Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 29 Aug 2018 13:24:56 +0000 (16:24 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 29 Aug 2018 13:24:56 +0000 (16:24 +0300)
commitc1db75e0c7b1584b555242ec53fbef5f71d0c48f
tree6fdbbfe786137d5adb34f01ae431ef8ef9bcd7df
parentee1e1ce377aa61ddea47a6c2114f99951153bb4f
parent087e9308eca6799f898ad3779e9307661eb5247f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
modules/core/test/test_arithm.cpp
modules/python/src2/cv2.cpp
modules/shape/src/aff_trans.cpp