mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-06-22 23:29:37 +00:00
Merge branch 'kanjitalk755:master' into sdl1-fix
This commit is contained in:
commit
05adbff2f5
|
@ -235,7 +235,7 @@ user_string_def common_strings[] = {
|
||||||
{STR_WINDOW_TITLE_GRABBED1, "Ctrl+"},
|
{STR_WINDOW_TITLE_GRABBED1, "Ctrl+"},
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
{STR_WINDOW_TITLE_GRABBED2, "Opt+"},
|
{STR_WINDOW_TITLE_GRABBED2, "Opt+"},
|
||||||
{STR_WINDOW_TITLE_GRABBED4, "Cmd+F5"},
|
{STR_WINDOW_TITLE_GRABBED4, "Cmd+"},
|
||||||
#else
|
#else
|
||||||
{STR_WINDOW_TITLE_GRABBED2, "Alt+"},
|
{STR_WINDOW_TITLE_GRABBED2, "Alt+"},
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -184,7 +184,7 @@ user_string_def common_strings[] = {
|
||||||
{STR_WINDOW_TITLE_GRABBED1, "Ctrl+"},
|
{STR_WINDOW_TITLE_GRABBED1, "Ctrl+"},
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
{STR_WINDOW_TITLE_GRABBED2, "Opt+"},
|
{STR_WINDOW_TITLE_GRABBED2, "Opt+"},
|
||||||
{STR_WINDOW_TITLE_GRABBED4, "Cmd+F5"},
|
{STR_WINDOW_TITLE_GRABBED4, "Cmd+"},
|
||||||
#else
|
#else
|
||||||
{STR_WINDOW_TITLE_GRABBED2, "Alt+"},
|
{STR_WINDOW_TITLE_GRABBED2, "Alt+"},
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user