Revert "Merge branch 'master' into wx3"

This reverts commit 33a0c10650, reversing
changes made to 2077655694.

Reverting merges fucks up git, but oh well - we probably better merge stuff manually rather than fucking up master with wx3 which is apparently buggy
This commit is contained in:
DarkPhoenix
2015-04-30 19:47:15 +03:00
parent c809a614f9
commit cca7f1112a
9 changed files with 40 additions and 51 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: