diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-15 20:16:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-15 20:16:16 +0300 |
| commit | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (patch) | |
| tree | 1759cd93802d506583c7030119f1115b0444e226 /src/input/inputmanager.h | |
| parent | a260aeab234704ace8ba672b1d1ce57e18425e07 (diff) | |
| parent | 22cb237571e06395ec241377721c02716f0ea8a7 (diff) | |
| download | mv-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.gz mv-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.bz2 mv-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.xz mv-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/input/inputmanager.h')
| -rw-r--r-- | src/input/inputmanager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index fcd1252c0..bf9e04f34 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -181,6 +181,8 @@ class InputManager final void executeAction(const int keyNum); protected: + void resetKey(const int i); + static bool isActionActive0(const int index) A_WARN_UNUSED; Setup_Input *mSetupInput; /**< Reference to setup window */ |