diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-12-29 20:09:43 +0100 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-12-29 20:09:43 +0100 |
commit | 74da2ff079653885d4de65f11623216bde34a94c (patch) | |
tree | 8a9a975269e567a849c9ce494414175b68e6061e /src/chat-server/guildmanager.cpp | |
parent | 3c1c0f640db636bb1cc588f22886ed165c7942d7 (diff) | |
download | manaserv-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/guildmanager.cpp')
-rw-r--r-- | src/chat-server/guildmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp index 586878d7..49b135ce 100644 --- a/src/chat-server/guildmanager.cpp +++ b/src/chat-server/guildmanager.cpp @@ -20,7 +20,7 @@ #include "guildmanager.h" #include "guild.h" -#include "protocol.h" +#include "manaserv_protocol.h" #include "defines.h" #include "account-server/storage.h" #include "chat-server/chatclient.h" |