-
Felix Paul Kühne authored
(cherry picked from commit 2f747cb43fc664c5cb180e8fc92bdd78510d277e) Conflicts: extras/package/macosx/vlc.xcodeproj/project.pbxproj modules/gui/macosx/ControlsBar.m
fb32a825
(cherry picked from commit 2f747cb43fc664c5cb180e8fc92bdd78510d277e) Conflicts: extras/package/macosx/vlc.xcodeproj/project.pbxproj modules/gui/macosx/ControlsBar.m