Merge branch 'master' into gain_gui_cleanup

This commit is contained in:
Charles J. Cliffe
2016-07-06 21:00:04 -04:00
19 changed files with 205 additions and 178 deletions
-1
View File
@@ -400,7 +400,6 @@ void GLFont::loadFontOnce() {
}
//2) then load from memory
lodepng::State state;
unsigned error = lodepng::decode(image, imgWidth, imgHeight, raw_image, png_size);
delete[] raw_image;