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, 4 insertions, 4 deletions

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index b019edb9..e89afd94 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -287,7 +287,7 @@ Setup_Video::Setup_Video():
     place(0, 11, mOverlayDetailSlider);
     place(0, 12, mParticleDetailSlider);
 
-    place(1, 6, alphaLabel, 2);
+    place(1, 6, alphaLabel, 3);
     place(1, 7, mFpsCheckBox).setPadding(3);
     place(1, 8, scrollRadiusLabel);
     place(1, 9, scrollLazinessLabel);
@@ -298,9 +298,9 @@ Setup_Video::Setup_Video():
     place(2, 7, mFpsField).setPadding(1);
     place(2, 8, mScrollRadiusField).setPadding(1);
     place(2, 9, mScrollLazinessField).setPadding(1);
-    place(2, 10, mSpeechLabel, 2).setPadding(2);
-    place(2, 11, mOverlayDetailField, 2).setPadding(2);
-    place(2, 12, mParticleDetailField, 2).setPadding(2);
+    place(2, 10, mSpeechLabel, 3).setPadding(2);
+    place(2, 11, mOverlayDetailField, 3).setPadding(2);
+    place(2, 12, mParticleDetailField, 3).setPadding(2);
 
     setDimension(gcn::Rectangle(0, 0, 325, 280));
 }