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/fontman.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/fontman.cpp')
-rw-r--r-- | graphics/fontman.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp index f40cf97602..e59e5a33c5 100644 --- a/graphics/fontman.cpp +++ b/graphics/fontman.cpp @@ -19,11 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "graphics/font.h" #include "graphics/fontman.h" +#include "graphics/font.h" +#include "graphics/fonts/bdf.h" + #include "common/translation.h" +namespace Common { DECLARE_SINGLETON(Graphics::FontManager); +} namespace Graphics { |