summaryrefslogtreecommitdiff
path: root/src/game-server/thing.h
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-12-29 20:09:43 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-12-29 20:09:43 +0100
commit74da2ff079653885d4de65f11623216bde34a94c (patch)
tree8a9a975269e567a849c9ce494414175b68e6061e /src/game-server/thing.h
parent3c1c0f640db636bb1cc588f22886ed165c7942d7 (diff)
downloadmanaserv-74da2ff079653885d4de65f11623216bde34a94c.tar.gz
manaserv-74da2ff079653885d4de65f11623216bde34a94c.tar.bz2
manaserv-74da2ff079653885d4de65f11623216bde34a94c.tar.xz
manaserv-74da2ff079653885d4de65f11623216bde34a94c.zip
protocol.h -> manaserv_protocol.h to avoid conflicts with mysql files.
Resolves: Mana-Mantis #278.
Diffstat (limited to 'src/game-server/thing.h')
-rw-r--r--src/game-server/thing.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game-server/thing.h b/src/game-server/thing.h
index f1f0df28..508d7529 100644
--- a/src/game-server/thing.h
+++ b/src/game-server/thing.h
@@ -21,7 +21,7 @@
#ifndef THING_H
#define THING_H
-#include "protocol.h"
+#include "manaserv_protocol.h"
#include <set>