-
Rémi Denis-Courmont authored
(cherry picked from commit d350820bdecf153a9e1ea072c672f240b7114992) Conflicts: modules/gui/qt4/ui/open_net.ui
cfeb72c0
(cherry picked from commit d350820bdecf153a9e1ea072c672f240b7114992) Conflicts: modules/gui/qt4/ui/open_net.ui