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

Get alpha clones in the database

2016-12-11 15:44:14 -05:00

alphaClones.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00

attribute.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00

category.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00

effect.py

flake8 fixes

2017-05-08 21:32:13 -04:00

group.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00

icon.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00

item.py

start picking at strat cruiser update

2017-06-21 22:19:37 -04:00

marketGroup.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00

metaData.py

Line endings again

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

metaGroup.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00

queries.py

Merge branch 'master' into test-3

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

traits.py

Burn types with fire

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

unit.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00