Merge commit 'aethyra/master'

Conflicts:
	CMakeLists.txt
	configure.ac
	data/help/header.txt
	packaging/windows/setup.nsi
	po/POTFILES.in
	src/being.cpp
	src/being.h
	src/game.cpp
	src/gui/color.cpp
	src/gui/color.h
	src/gui/equipmentwindow.h
	src/gui/popupmenu.cpp
	src/gui/recorder.cpp
	src/gui/setup_colors.h
	src/gui/setup_keyboard.cpp
	src/gui/setup_keyboard.h
	src/gui/skill.cpp
	src/gui/speechbubble.cpp
	src/gui/speechbubble.h
	src/gui/table.cpp
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/main.cpp
	src/main.h
	src/map.cpp
	src/resources/colordb.cpp
	src/resources/colordb.h
	src/resources/emotedb.cpp
	src/resources/emotedb.h
	src/text.cpp
	src/text.h
	src/tmw.rc
	src/winver.h

1 files changed, 1 insertions, 5 deletions

diff --git a/src/text.cpp b/src/text.cpp
index c4559879..cb4587d3 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -150,20 +150,16 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
         graphics->setColor(gcn::Color(0, 0, 0));
         graphics->drawText(mText, mX - xOff + 1, mY - yOff,
                 gcn::Graphics::LEFT);
-
         graphics->drawText(mText, mX - xOff - 1, mY - yOff,
                 gcn::Graphics::LEFT);
-
         graphics->drawText(mText, mX - xOff, mY - yOff + 1,
                 gcn::Graphics::LEFT);
-
         graphics->drawText(mText, mX - xOff, mY - yOff - 1,
                 gcn::Graphics::LEFT);
     }
 
     graphics->setColor(mColor);
-    graphics->drawText(mText, mX - xOff, mY - yOff,
-            gcn::Graphics::LEFT);
+    graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT);
 }
 
 FlashText::FlashText(const std::string &text, int x, int y,