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

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

2017-02-07 19:22:26 -05:00

..

__init__.py

Line endings again

2017-02-07 19:07:22 -05:00

fitDps.py

Burn types with fire

2017-01-09 22:36:19 -08:00