Merge branch 'master' into city-chooser

This commit is contained in:
Gergely Polonkai 2014-08-21 01:06:58 +02:00
commit 9a8a0bb9d9

View File

@ -301,14 +301,14 @@ setup_actions(AgApp *app)
} }
const gchar *action_accels[] = { const gchar *action_accels[] = {
"win.close", "<Ctrl>W", NULL, "win.close", "<Primary>W", NULL,
"win.save", "<Ctrl>S", NULL, "win.save", "<Primary>S", NULL,
"win.export", "<Ctrl><Shift>E", NULL, "win.export", "<Primary><Shift>E", NULL,
"win.gear-menu", "F10", NULL, "win.gear-menu", "F10", NULL,
"app.help", "F1", NULL, "app.help", "F1", NULL,
"win.change-tab::chart", "F5", NULL, "win.change-tab::chart", "F5", NULL,
"win.change-tab::aspects", "F9", NULL, "win.change-tab::aspects", "F9", NULL,
"win.change-tab::edit", "F10", NULL, "win.change-tab::edit", "F10", NULL,
NULL NULL
}; };