summaryrefslogtreecommitdiff
path: root/src/gui/widgets/battletab.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/gui/widgets/battletab.cpp
parentc1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff)
parent9505e3789cc9db6a10a68b9794a586604271b76f (diff)
downloadManaVerse-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz
ManaVerse-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2
ManaVerse-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz
ManaVerse-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/widgets/battletab.cpp')
-rw-r--r--src/gui/widgets/battletab.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp
index e72c78ee0..c5500e801 100644
--- a/src/gui/widgets/battletab.cpp
+++ b/src/gui/widgets/battletab.cpp
@@ -22,10 +22,10 @@
#include "gui/widgets/battletab.h"
-#include "chatlog.h"
+#include "chatlogger.h"
#include "commandhandler.h"
#include "localplayer.h"
-#include "log.h"
+#include "logger.h"
#include "main.h"
#include "gui/theme.h"