diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
| commit | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (patch) | |
| tree | 2d85d112997176e9ab765e638b0e7f2e16677b83 /src/gui/windows/equipmentwindow.h | |
| parent | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (diff) | |
| parent | 8983700f6c8cc6496626ed3af235e1ec31fe5501 (diff) | |
| download | manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.gz manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.bz2 manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.xz manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/windows/equipmentwindow.h')
| -rw-r--r-- | src/gui/windows/equipmentwindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 245328b8e..45d4246e3 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -86,7 +86,7 @@ class EquipmentWindow final : public Window, void action(const ActionEvent &event) override final; - void mousePressed(MouseEvent& mouseEvent) override final; + void mousePressed(MouseEvent& event) override final; const Item* getEquipment(const int i) const A_WARN_UNUSED { return mEquipment ? mEquipment->getEquipment(i) : nullptr; } |