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/gui/windows/tradewindow.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/gui/windows/tradewindow.h')
| -rw-r--r-- | src/gui/windows/tradewindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index 9704c1e80..447e99144 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -171,13 +171,13 @@ class TradeWindow final : public Window, Button *mMoneyChangeButton; TextField *mMoneyField; - Status mStatus; Item* mAutoAddItem; std::string mAutoAddToNick; int mGotMoney; int mGotMaxMoney; int mAutoMoney; int mAutoAddAmount; + Status mStatus; bool mOkOther; bool mOkMe; }; |