Merge branch 'master' into wx3
Conflicts: pyfa.py
This commit is contained in:
@@ -1,8 +1,3 @@
|
||||
'''
|
||||
Font file to handle the differences in font calculations between
|
||||
different wxPython versions
|
||||
'''
|
||||
|
||||
import wx
|
||||
|
||||
if 'wxMac' in wx.PlatformInfo:
|
||||
|
||||
Reference in New Issue
Block a user