summaryrefslogtreecommitdiff
path: root/muse2/muse/app.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-06-06 12:45:57 +0000
committerFlorian Jung <flo@windfisch.org>2011-06-06 12:45:57 +0000
commitd9380293e430d47e03ef94a9914e200c297bc376 (patch)
treeb603a9b028cb1419d634c75b8fce09583b58fa58 /muse2/muse/app.cpp
parent5e9533d5620f312b3727122c1680d97cf6ca2ff1 (diff)
parente33204ce476daafda6dbfda8c9db2d8dce898ef3 (diff)
merged with current trunk and removed (unused) support for disabling the keymap
Diffstat (limited to 'muse2/muse/app.cpp')
-rw-r--r--muse2/muse/app.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 04c55b01..9e2f6c9a 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -3742,7 +3742,7 @@ void MusE::updateConfiguration()
trackAInputAction->setShortcut(shortcuts[SHRT_ADD_AUDIO_INPUT].key);
trackAAuxAction->setShortcut(shortcuts[SHRT_ADD_AUDIO_AUX].key);
- editSelectAllAction->setShortcut(shortcuts[SHRT_SELECT_NONE].key);
+ editSelectAllAction->setShortcut(shortcuts[SHRT_SELECT_ALL].key);
editDeselectAllAction->setShortcut(shortcuts[SHRT_SELECT_NONE].key);
editInvertSelectionAction->setShortcut(shortcuts[SHRT_SELECT_INVERT].key);
editInsideLoopAction->setShortcut(shortcuts[SHRT_SELECT_OLOOP].key);