Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 19 Sep 2018 07:54:15 +0000 (10:54 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Wed, 19 Sep 2018 07:58:43 +0000 (10:58 +0300)
commit861415133e555df2158423726eed9290bbdfe1b9
treecd2d055a2ecd52d82018f78df4f82ac3e83ca0fb
parent53ad291ef10791f9d65405ef9a08fb2bd525081b
parent87b1835cb6c216731e732f690c784b4a9200ce5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/src/op_inf_engine.cpp