Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 16 Apr 2018 09:41:47 +0000 (12:41 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 16 Apr 2018 09:41:47 +0000 (12:41 +0300)
commit4b2d1aaeea52e07dff6e925a86313bd3c2f66e8b
treec6cfb93bab138366c65397968ab114602e67f7e3
parent7e5581cd86bfa82de5aaccd69f871cd4ebd2bf5d
parent225c75e4a18e779b418530fab812738498bc5c1e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
cmake/templates/cvconfig.h.in
modules/core/include/opencv2/core/base.hpp
modules/core/src/system.cpp
modules/imgproc/src/deriv.cpp
modules/imgproc/src/smooth.cpp