summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilefont.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-01-11 13:03:13 +0100
committerAdam Borowski <kilobyte@angband.pl>2011-01-11 13:03:13 +0100
commite7c3fa432cecc5eeb49d79109033fd85ee3cad2a (patch)
treefe057b8382c66ffccbd6c6a01ce3286b691c2135 /crawl-ref/source/tilefont.h
parente5001fba77867a842c1b0b192ec6969aab1cf102 (diff)
parentcc071d90f3d21a23526d1f92d055835e3d370d73 (diff)
downloadcrawl-ref-e7c3fa432cecc5eeb49d79109033fd85ee3cad2a.tar.gz
crawl-ref-e7c3fa432cecc5eeb49d79109033fd85ee3cad2a.zip
Merge branch 'master' into unicode
Conflicts galore...
Diffstat (limited to 'crawl-ref/source/tilefont.h')
-rw-r--r--crawl-ref/source/tilefont.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/tilefont.h b/crawl-ref/source/tilefont.h
index 3700b41ada..581ae3b810 100644
--- a/crawl-ref/source/tilefont.h
+++ b/crawl-ref/source/tilefont.h
@@ -13,7 +13,7 @@
extern const VColour term_colours[MAX_TERM_COLOUR];
class FontBuffer;
-class VColour;
+struct VColour;
class formatted_string;
class FontWrapper