Merge pull request #1 from uic-evl/master

combine from febret
change FTGLFontType enums
Merge pull request #97 from sufulow/master

change FTGLFontType enums