5 Commits

Author	SHA1	Message	Date
blitzmann	5372f31be8	Revert "Revert "Merge branch 'master' into wx3"". So many reverts. ... This reverts commit cca7f1112a.	2015-06-27 21:53:59 -04:00
DarkPhoenix	cca7f1112a	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	2015-04-30 19:47:15 +03:00
DarkPhoenix	e8268633e3	Merge branch 'master' into wx3 ... Used code from the master on conflicts	2014-12-15 15:45:33 +03:00
blitzmann	88074c8516	Fix fonts and lag with OS X	2014-12-11 23:25:44 -05:00
blitzmann	a603a4359a	Fixed font discrepancy from different wxPython versions.	2014-11-08 16:45:09 +02:00