Merge in default

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2016-02-26 14:52:02 +01:00
20 changed files with 95 additions and 113 deletions
+1 -1
View File
@@ -195,7 +195,7 @@ public:
uint32 getTextureCacheID() const;
static bool getConstant(const char *in, AlignMode &out);
static bool getConstant(AlignMode in, const char *&out);
static bool getConstant(AlignMode in, const char *&out);
static int fontCount;