summaryrefslogtreecommitdiff
path: root/src/gui/trade.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-06 10:38:07 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-06 10:38:07 +0100
commit7cbdab589491e007adacd7597c769cdb9308a32c (patch)
tree0269c37cccbed49a1cb15db9de816f39ef549189 /src/gui/trade.cpp
parent616afb27c23def5661b3466d6fc86fd1c65c0082 (diff)
parentaa4229cbb9f2b264ca96c3beedc66b1c79ccc1f5 (diff)
downloadmana-client-7cbdab589491e007adacd7597c769cdb9308a32c.tar.gz
mana-client-7cbdab589491e007adacd7597c769cdb9308a32c.tar.bz2
mana-client-7cbdab589491e007adacd7597c769cdb9308a32c.tar.xz
mana-client-7cbdab589491e007adacd7597c769cdb9308a32c.zip
Merge branch 'aethyra/master'
Conflicts: src/being.cpp src/being.h src/floor_item.cpp src/floor_item.h src/flooritemmanager.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/popupmenu.cpp src/net/beinghandler.cpp src/npc.cpp
Diffstat (limited to 'src/gui/trade.cpp')
-rw-r--r--src/gui/trade.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 2f6007a9..2deabbf2 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -117,7 +117,6 @@ void TradeWindow::widgetResized(const gcn::Event &event)
Window::widgetResized(event);
}
-
void TradeWindow::addMoney(int amount)
{
mMoneyLabel->setCaption(strprintf(_("You get %s."),