Merged branch 'master' into c++11.

2014-10-23 08:40:39 +02:00
parent 6a9f8a7615 4bfd2c9707
commit f8c54f4243
51 changed files with 820 additions and 527 deletions
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -2321,7 +2321,7 @@ cItem * cSlotAreaTemporary::GetPlayerSlots(cPlayer & a_Player)
 	if (itr == m_Items.end())
 	{
 		return nullptr;
-	}	
+	}
 	return itr->second.data();
 }