Merge branch 'aethyra/master'

Conflicts:
	data/graphics/images/login_wallpaper.png
	src/being.cpp
	src/beingmanager.cpp
	src/engine.cpp
	src/game.cpp
	src/gui/buysell.cpp
	src/gui/buysell.h
	src/gui/gui.h
	src/gui/npc_text.cpp
	src/gui/npc_text.h
	src/gui/npcintegerdialog.cpp
	src/gui/npclistdialog.cpp
	src/gui/npclistdialog.h
	src/gui/npcstringdialog.cpp
	src/gui/sell.cpp
	src/gui/shop.cpp
	src/gui/table.cpp
	src/net/beinghandler.cpp
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/npc.cpp
	src/npc.h
	src/shopitem.cpp
	src/shopitem.h
	src/utils/stringutils.cpp
	src/utils/stringutils.h
	src/utils/trim.h

1 files changed, 3 insertions, 3 deletions

diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index d6bb1d49..ee55799f 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -51,8 +51,7 @@ ShopItem::~ShopItem()
     }
 }
 
-void ShopItem::addDuplicate(int inventoryIndex,
-        int quantity)
+void ShopItem::addDuplicate(int inventoryIndex, int quantity)
 {
     DuplicateItem* di = new DuplicateItem;
     di->inventoryIndex = inventoryIndex;
@@ -76,7 +75,8 @@ int ShopItem::sellCurrentDuplicate(int quantity)
     int sellCount = quantity <= dupl->quantity ? quantity : dupl->quantity;
     dupl->quantity -= sellCount;
     mQuantity -= sellCount;
-    if (dupl->quantity == 0) {
+    if (dupl->quantity == 0)
+    {
         delete dupl;
         mDuplicates.pop();
     }