From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 9 Dec 2012 14:33:14 +0000 (+0100)
Subject: Merge branch 'master' into feature-33-capsules
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=60e0fe29ce6cd033edc78b181d9d07fa72c11172;hp=67f6bb1d9727e7d1e2140cf2913aa89ebba84bf5;p=l2e.git

Merge branch 'master' into feature-33-capsules

I am a dork
---

diff --git a/l2e.cbp b/l2e.cbp
index 18f6b88..64f428d 100644
--- a/l2e.cbp
+++ b/l2e.cbp
@@ -156,6 +156,8 @@
 		<Unit filename="src\graphics\SimpleAnimation.h" />
 		<Unit filename="src\graphics\Sprite.cpp" />
 		<Unit filename="src\graphics\Sprite.h" />
+		<Unit filename="src\graphics\Texture.cpp" />
+		<Unit filename="src\graphics\Texture.h" />
 		<Unit filename="src\graphics\fwd.h" />
 		<Unit filename="src\loader\Caster.cpp" />
 		<Unit filename="src\loader\Caster.h" />
@@ -204,7 +206,6 @@
 		<Unit filename="src\menu\ConfigMenu.h" />
 		<Unit filename="src\menu\EquipMenu.cpp" />
 		<Unit filename="src\menu\EquipMenu.h" />
-		<Unit filename="src\menu\fwd.h" />
 		<Unit filename="src\menu\HeroStatus.cpp" />
 		<Unit filename="src\menu\HeroStatus.h" />
 		<Unit filename="src\menu\InventoryMenu.cpp" />
@@ -221,6 +222,7 @@
 		<Unit filename="src\menu\SpellMenu.h" />
 		<Unit filename="src\menu\StatusMenu.cpp" />
 		<Unit filename="src\menu\StatusMenu.h" />
+		<Unit filename="src\menu\fwd.h" />
 		<Unit filename="src\sdl\InitImage.cpp" />
 		<Unit filename="src\sdl\InitImage.h" />
 		<Unit filename="src\sdl\InitSDL.cpp" />