summaryrefslogtreecommitdiff
path: root/src/player_relations.h
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2009-02-11 09:30:26 +0000
committerDavid Athay <ko2fan@gmail.com>2009-02-11 09:30:26 +0000
commit91111ca5d13072ea3b834e23835df9c077329e39 (patch)
treef0af8dd08b766164835cf9b5412a9aa3267dbad7 /src/player_relations.h
parent8046bb2626b30fecdcea54eb0aa3349cdb7d277b (diff)
parent63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff)
downloadmana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.gz
mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.bz2
mana-client-91111ca5d13072ea3b834e23835df9c077329e39.tar.xz
mana-client-91111ca5d13072ea3b834e23835df9c077329e39.zip
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/player_relations.h')
-rw-r--r--src/player_relations.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/player_relations.h b/src/player_relations.h
index 6cbaf6b3..1eb4ede6 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -22,13 +22,13 @@
#ifndef PLAYER_RELATIONS_H
#define PLAYER_RELATIONS_H
-#include "being.h"
-#include "player.h"
-#include "configuration.h"
-#include <string>
+#include <list>
#include <map>
+#include <string>
#include <vector>
-#include <list>
+
+class Being;
+class Player;
struct PlayerRelation
{