-
Felix Paul Kühne authored
(cherry picked from commit 6c62d7475dce83cbc116f4bcc470ee4f9078e6c1) Conflicts: modules/gui/macosx/intf.m
77c6906f
(cherry picked from commit 6c62d7475dce83cbc116f4bcc470ee4f9078e6c1) Conflicts: modules/gui/macosx/intf.m