Merge remote-tracking branch 'upstream/3.4' into merge-3.4

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Sat, 3 Jul 2021 00:30:58 +0000 (00:30 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Sat, 3 Jul 2021 00:30:58 +0000 (00:30 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 3 Jul 2021 00:30:58 +0000 (00:30 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 3 Jul 2021 00:30:58 +0000 (00:30 +0000)
diff --cc cmake/OpenCVDetectInferenceEngine.cmake
Simple merge
diff --cc modules/dnn/src/layers/normalize_bbox_layer.cpp
Simple merge
diff --cc platforms/winpack_dldt/build_package.py
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Sat, 3 Jul 2021 00:30:58 +0000 (00:30 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Sat, 3 Jul 2021 00:30:58 +0000 (00:30 +0000)
		1	2
cmake/OpenCVDetectInferenceEngine.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
modules/dnn/src/layers/normalize_bbox_layer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
platforms/winpack_dldt/build_package.py	patch \|	diff1 \|	diff2 \|	blob \| history