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

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

Browse Source 
Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py
This commit is contained in:
blitzman
2017-02-07 19:22:26 -05:00
parent ca311e5dec 3c31391ec9
commit f7d7b3fe5e
66 changed files with 137 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/builtinViews/fittingView.py
View File

@@ -25,7 +25,8 @@ import gui.display as d
from gui.contextMenu import ContextMenu
import gui.shipBrowser
import gui.multiSwitch
from eos.types import Slot, Rack, Module, Mode
from eos.saveddata.mode import Mode
from eos.saveddata.module import Module, Slot, Rack
from gui.builtinViewColumns.state import State
from gui.bitmapLoader import BitmapLoader
import gui.builtinViews.emptyView