Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 17 Aug 2020 10:29:12 +0000 (10:29 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 17 Aug 2020 10:29:12 +0000 (10:29 +0000)
1  2 
modules/features2d/include/opencv2/features2d.hpp
modules/highgui/src/window_gtk.cpp

Simple merge