blitzmann b30b3fcbf1 Merge branch 'master' into test-3 ...

Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py

2017-11-23 11:19:05 -05:00

..

db

Merge branch 'master' into test-3

2017-11-23 11:19:05 -05:00

effects

Merge branch 'master' into test-3

2017-11-23 11:19:05 -05:00

graph

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

saveddata

Merge branch 'master' into test-3

2017-11-23 11:19:05 -05:00

__init__.py

Roll up #967 and #974

2017-02-08 13:12:54 -08:00

capSim.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

config.py

comment out most of the fluff in pyfa.py. Need to come back to this and get it all working

2017-06-12 16:37:15 -04:00

effectHandlerHelpers.py

Fixed some missing chrome tab stuff, as well as more conversion issues

2017-06-13 15:18:40 -04:00

enum.py

Convert old style classes to new

2017-02-08 23:06:39 -08:00

eqBase.py

Tox fixes

2017-02-09 00:59:22 -08:00

events.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

gamedata.py

Merge branch 'master' into test-3

2017-11-23 11:19:05 -05:00

lgpl.txt

Set files to 644 besides pyfa.py and scripts

2014-07-30 21:23:27 -04:00

modifiedAttributeDict.py

Merge branch 'master' into test-3

2017-11-23 11:19:05 -05:00