summaryrefslogtreecommitdiff
path: root/src/chat-server/guildhandler.cpp
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/chat-server/guildhandler.cpp
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/chat-server/guildhandler.cpp')
-rw-r--r--src/chat-server/guildhandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index e6970182..4f332cdd 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -31,7 +31,7 @@
#include "net/messagein.h"
#include "net/messageout.h"
-#include "protocol.h"
+#include "manaserv_protocol.h"
void ChatHandler::sendGuildInvite(const std::string &invitedName,
const std::string &inviterName,