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
@@ -53,7 +53,7 @@ private:
void load();
// The image data
Object::StrongRef<love::image::ImageData> imageData;
StrongRef<love::image::ImageData> imageData;
// The glyphs in the font
uint32 *glyphs;