Merge branch 'master' into wx3

Conflicts:
	pyfa.py
This commit is contained in:
blitzmann
2015-06-27 19:33:12 -04:00
60 changed files with 671 additions and 373 deletions

View File

@@ -1,8 +1,3 @@
'''
Font file to handle the differences in font calculations between
different wxPython versions
'''
import wx
if 'wxMac' in wx.PlatformInfo: