diff options
| author | Blue <bluesansdouze@gmail.com> | 2009-05-18 01:19:32 +0200 |
|---|---|---|
| committer | Blue <bluesansdouze@gmail.com> | 2009-05-18 01:19:32 +0200 |
| commit | 7b76f0e8c4c489254d7519e2916b951601423801 (patch) | |
| tree | e4430176f02eeec32ebb56b42933b6416e7895df /src/keyboardconfig.cpp | |
| parent | 22685431a23b05d66af28abda488d0891b1c0a34 (diff) | |
| parent | aaec4d115cd0048bbc4bed3d8b1d33492b2a51fa (diff) | |
| download | mana-7b76f0e8c4c489254d7519e2916b951601423801.tar.gz mana-7b76f0e8c4c489254d7519e2916b951601423801.tar.bz2 mana-7b76f0e8c4c489254d7519e2916b951601423801.tar.xz mana-7b76f0e8c4c489254d7519e2916b951601423801.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/keyboardconfig.cpp')
| -rw-r--r-- | src/keyboardconfig.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index b5db3de5..ca6804f4 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -80,6 +80,7 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { {"keyWindowDebug", SDLK_F10, _("Debug Window")}, {"keyWindowParty", SDLK_F11, _("Party Window")}, {"keyWindowEmoteBar", SDLK_F12, _("Emote Shortcut Window")}, + {"keyWindowOutfit", SDLK_o, _("Outfits Window")}, {"keyEmoteShortcut1", SDLK_1, strprintf(_("Emote Shortcut %d"), 1)}, {"keyEmoteShortcut2", SDLK_2, strprintf(_("Emote Shortcut %d"), 2)}, {"keyEmoteShortcut3", SDLK_3, strprintf(_("Emote Shortcut %d"), 3)}, |