summaryrefslogtreecommitdiff
path: root/src/net/manaserv/guildhandler.cpp
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2011-08-24 22:42:17 +0200
committerReid <reidyaro@gmail.com>2011-08-24 22:42:17 +0200
commit43c19a8321bd0c4bcf36655d74e895397aff7eea (patch)
treec8f7933367ae1e757a3166a04772274896d58c9c /src/net/manaserv/guildhandler.cpp
parentc1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff)
parent9505e3789cc9db6a10a68b9794a586604271b76f (diff)
downloadmv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz
mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2
mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz
mv-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/net/manaserv/guildhandler.cpp')
-rw-r--r--src/net/manaserv/guildhandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index dc3dbc616..306a15be4 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -24,7 +24,7 @@
#include "event.h"
#include "guild.h"
-#include "log.h"
+#include "logger.h"
#include "localplayer.h"
#include "channel.h"
#include "channelmanager.h"