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

..

__init__.py

Rework pricing.

2017-04-05 14:40:27 -07:00

capacitorViewFull.py

More deprecated fixes, and re-enable a working stats view

2017-06-14 03:51:40 -04:00

firepowerViewFull.py

More deprecated fixes, and re-enable a working stats view

2017-06-14 03:51:40 -04:00

miningyieldViewFull.py

Merge branch 'master' into test-3

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

outgoingViewFull.py

More deprecated fixes, and re-enable a working stats view

2017-06-14 03:51:40 -04:00

outgoingViewMinimal.py

More deprecated fixes, and re-enable a working stats view

2017-06-14 03:51:40 -04:00

priceViewFull.py

Merge branch 'master' into test-3

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

priceViewMinimal.py

Merge branch 'master' into test-3

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

rechargeViewFull.py

More deprecated fixes, and re-enable a working stats view

2017-06-14 03:51:40 -04:00

resistancesViewFull.py

Fix gauges again, convert remaining IconFromBitmap > Icon

2017-06-14 15:05:12 -04:00

resourcesViewFull.py

Fix gauges again, convert remaining IconFromBitmap > Icon

2017-06-14 15:05:12 -04:00

targetingMiscViewFull.py

More deprecated fixes, and re-enable a working stats view

2017-06-14 03:51:40 -04:00

targetingMiscViewMinimal.py

More deprecated fixes, and re-enable a working stats view

2017-06-14 03:51:40 -04:00