Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-12-30 00:46:50 +01:00
commit 9bc9c8585b

View file

@ -22,8 +22,6 @@
#include "stdpch.h"
//
#include "resists.h"
#include "player_manager/character.h"
#include "game_item_manager/game_item.h"
//////////////
// USING //