diff options
author | Alyssa Milburn | 2011-07-07 09:24:10 +0200 |
---|---|---|
committer | Alyssa Milburn | 2011-07-07 09:24:10 +0200 |
commit | 66e81d633f987310f12038147ae01b8ce4f640f7 (patch) | |
tree | 6035a7124789c3e6cdff5f603e9933529b7efdc7 /graphics/fonts/consolefont.cpp | |
parent | affaa1f4d6cf5f27f654029133b1aec7b9eca4b5 (diff) | |
parent | 72da8ef5adf82d8a65da299207f30af5058ca8a9 (diff) | |
download | scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.tar.gz scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.tar.bz2 scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.zip |
Merge remote-tracking branch 'origin/master' into soltys_wip2
Diffstat (limited to 'graphics/fonts/consolefont.cpp')
-rw-r--r-- | graphics/fonts/consolefont.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/fonts/consolefont.cpp b/graphics/fonts/consolefont.cpp index 65ccd3ec70..5b4768327a 100644 --- a/graphics/fonts/consolefont.cpp +++ b/graphics/fonts/consolefont.cpp @@ -1,5 +1,5 @@ /* Generated by convbdf on Sat Jun 17 01:37:46 2006. */ -#include "graphics/font.h" +#include "graphics/fonts/bdf.h" /* Font information: name: 5x8-L1 @@ -5635,7 +5635,7 @@ static const unsigned long _sysfont_offset[] = { }; /* Exported structure definition. */ -static const FontDesc desc = { +static const BdfFontDesc desc = { "5x8-L1", 5, 8, |