Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 26 Mar 2019 18:55:53 +0000 (18:55 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 26 Mar 2019 18:56:54 +0000 (18:56 +0000)
commit90df5e00b4cb8e973ba28811811f34396216b621
tree7e47b490f9c7bcabecc097c9b758a952de30b9e6
parent8c25a8eb7b10fb50cda323ee6bec68aa1a9ce43c
parent9340fc0c507b7b8c356744b3114a4007f296619b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
cmake/templates/cvconfig.h.in
modules/dnn/src/layers/lrn_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp