dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 20 Wiki Activity

Merge branch 'ammo_graph' into singularity

Browse Source 
# Conflicts:
#	gui/targetProfileEditor.py
This commit is contained in:
DarkPhoenix
2020-06-09 19:04:20 +03:00
parent 7eaeea325d aec5a46452
commit 27d3bea8d8
28 changed files with 582 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/characterEditor.py
View File

@@ -34,7 +34,7 @@ from wx.lib.agw.floatspin import FloatSpin
import config
import gui.globalEvents as GE
from gui.auxFrame import AuxiliaryFrame
from gui.auxWindow import AuxiliaryFrame
from gui.bitmap_loader import BitmapLoader
from gui.builtinViews.entityEditor import BaseValidator, EntityEditor, TextEntryValidatedDialog
from gui.builtinViews.implantEditor import BaseImplantEditorView