aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorChristopher Page2008-06-11 17:36:21 +0000
committerChristopher Page2008-06-11 17:36:21 +0000
commite86a422e252ade394ca796cae767c4d3221d3c4a (patch)
treecce35a7a31f15119d531a91448a19029e0099b99 /graphics
parent4fddafa3e6ef1c250804ea6ce9baaf2a911027e8 (diff)
parent33fd755a0ebab6d3ca4e877b15c4d3d7d25877f9 (diff)
downloadscummvm-rg350-e86a422e252ade394ca796cae767c4d3221d3c4a.tar.gz
scummvm-rg350-e86a422e252ade394ca796cae767c4d3221d3c4a.tar.bz2
scummvm-rg350-e86a422e252ade394ca796cae767c4d3221d3c4a.zip
Merged revisions 32564-32565,32567-32575,32577,32579-32594,32596-32603,32605-32639,32644-32646,32648-32666 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk svn-id: r32667
Diffstat (limited to 'graphics')
-rw-r--r--graphics/fontman.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/fontman.h b/graphics/fontman.h
index eeefab77ec..7121c314cd 100644
--- a/graphics/fontman.h
+++ b/graphics/fontman.h
@@ -84,7 +84,7 @@ private:
friend class Common::Singleton<SingletonBaseType>;
FontManager();
- Common::HashMap<Common::String, const Font *, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> _fontMap;
+ Common::HashMap<Common::String, const Font *> _fontMap;
};