Merge pull request #7462 from alalek:cpu_multi_target
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 21 Mar 2017 19:51:32 +0000 (19:51 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 21 Mar 2017 19:51:32 +0000 (19:51 +0000)
1  2 
CMakeLists.txt
cmake/OpenCVPCHSupport.cmake
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/fast_math.hpp
modules/core/src/system.cpp
modules/highgui/CMakeLists.txt
modules/imgproc/src/imgwarp.cpp

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