Merge branch 'aethyra/master'

Conflicts:
	src/being.cpp
	src/being.h
	src/floor_item.cpp
	src/floor_item.h
	src/flooritemmanager.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/popupmenu.cpp
	src/net/beinghandler.cpp
	src/npc.cpp

1 files changed, 0 insertions, 2 deletions

diff --git a/src/npc.h b/src/npc.h
index 63a0b953..b6dddab0 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -22,8 +22,6 @@
 #ifndef NPC_H
 #define NPC_H
 
-#include <SDL_types.h>
-
 #include "player.h"
 
 class Network;