summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/libgui.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2010-01-18 12:30:25 +0100
committerRobert Vollmert <rvollmert@gmx.net>2010-01-18 12:30:25 +0100
commit01864d17062014a1a041fb828eec1ab6df489b1e (patch)
tree098226ffeac668592239b248e069ed9863b4298e /crawl-ref/source/libgui.cc
parentdf9fdbfa36fbd8b3444e467c21c454ce20108a7c (diff)
parentae857123a34b0c8435fb2a5e0f02a0fe9c27704f (diff)
downloadcrawl-ref-01864d17062014a1a041fb828eec1ab6df489b1e.tar.gz
crawl-ref-01864d17062014a1a041fb828eec1ab6df489b1e.zip
Merge branch 'master' into messagewindow
Diffstat (limited to 'crawl-ref/source/libgui.cc')
-rw-r--r--crawl-ref/source/libgui.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index c72370b665..240ac4c2d7 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -16,11 +16,9 @@
#include "cio.h"
#include "defines.h"
#include "env.h"
-#include "itemprop.h"
#include "externs.h"
#include "tilereg.h"
#include "message.h"
-#include "showsymb.h"
#include "stash.h"
#include "state.h"
#include "stuff.h"