summaryrefslogtreecommitdiff
path: root/src/gui/popups/spellpopup.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-30 00:07:54 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-30 00:07:54 +0300
commita93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (patch)
tree2d85d112997176e9ab765e638b0e7f2e16677b83 /src/gui/popups/spellpopup.h
parent5c83a96b8ad85ad0562542b9720a0df6c5fb550c (diff)
parent8983700f6c8cc6496626ed3af235e1ec31fe5501 (diff)
downloadmanaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.gz
manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.bz2
manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.xz
manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.zip
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/popups/spellpopup.h')
-rw-r--r--src/gui/popups/spellpopup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h
index cbbd53703..0352161fc 100644
--- a/src/gui/popups/spellpopup.h
+++ b/src/gui/popups/spellpopup.h
@@ -59,7 +59,7 @@ class SpellPopup final : public Popup
*/
void view(const int x, const int y);
- void mouseMoved(MouseEvent &mouseEvent) override final;
+ void mouseMoved(MouseEvent &event) override final;
private:
Label *mItemName;