Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-01-29 21:27:05 -04:00
22 changed files with 149 additions and 164 deletions
+1 -1
View File
@@ -211,7 +211,7 @@ private:
const Glyph &findGlyph(uint32 glyph);
void printv(const Matrix &t, const std::vector<DrawCommand> &drawcommands, const std::vector<GlyphVertex> &vertices);
Object::StrongRef<love::font::Rasterizer> rasterizer;
StrongRef<love::font::Rasterizer> rasterizer;
int height;
float lineHeight;