Merge with develop

--HG-- branch : compatibility-develop
2015-12-30 00:46:50 +01:00 · 2015-12-30 00:46:50 +01:00 · 9bc9c8585b
commit 9bc9c8585b
parent df308276ed ef6b8fb501
1 changed files with 0 additions and 2 deletions
--- a/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp
@ -22,8 +22,6 @@
 #include "stdpch.h"
 //
 #include "resists.h"
-#include "player_manager/character.h"
-#include "game_item_manager/game_item.h"

 //////////////
 //	USING	//