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

Merge branch 'test-3' into esi

Browse Source 
# Conflicts:
#	eos/saveddata/character.py
#	service/character.py
#	service/eveapi.py
#	service/pycrest/eve.py
This commit is contained in:
blitzmann
2018-03-10 15:32:21 -05:00
parent fe1c4cc4d4 fac31f7254
commit 5560ef4d34
113 changed files with 846 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/characterSelection.py
View File

@@ -97,7 +97,7 @@ class CharacterSelection(wx.Panel):
grantItem = menu.Append(wx.ID_ANY, "Grant Missing Skills")
self.Bind(wx.EVT_MENU, self.grantMissingSkills, grantItem)
exportItem = menu.Append(wx.ID_ANY, "Export Missing Skills")
exportItem = menu.Append(wx.ID_ANY, "Copy Missing Skills")
self.Bind(wx.EVT_MENU, self.exportSkills, exportItem)
self.PopupMenu(menu, pos)