Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 9 Oct 2018 21:18:37 +0000 (21:18 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 9 Oct 2018 21:20:15 +0000 (21:20 +0000)
12 files changed:
1  2 
3rdparty/ffmpeg/ffmpeg.cmake
cmake/OpenCVMinDepVersions.cmake
modules/calib3d/src/calibration.cpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/private.hpp
modules/core/src/system.cpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/js/src/core_bindings.cpp
modules/ts/src/cuda_test.cpp

Simple merge
@@@ -1,6 -1,6 +1,6 @@@
 -set(MIN_VER_CMAKE 2.8.12.2)
 +set(MIN_VER_CMAKE 3.5.1)
  set(MIN_VER_CUDA 6.5)
- set(MIN_VER_PYTHON2 2.6)
+ set(MIN_VER_PYTHON2 2.7)
  set(MIN_VER_PYTHON3 3.2)
  set(MIN_VER_ZLIB 1.2.3)
  set(MIN_VER_GTK 2.18.0)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge