Merge branch 'master' into nc_0_8_5_10
This commit is contained in:
@@ -174,4 +174,4 @@ const QString& ShortcutsWidget::nativeOSHotKeyText(const QString& text)
|
||||
m_res.replace("Shift+", "⇧");
|
||||
return m_res;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user