Conflicts: lime/graphics/Font.hx project/include/graphics/Font.h project/src/ExternalInterface.cpp project/src/graphics/Font.cpp
Conflicts: lime/graphics/Font.hx project/include/graphics/Font.h project/src/ExternalInterface.cpp project/src/graphics/Font.cpp