blitzman 85131e6166 oh god this isn't gonna work ...

Merge branch 'ebag_importchanges' into test_import

Conflicts:
	config.py
	eos/db/saveddata/queries.py
	eos/effects/chargebonuswarfarecharge.py
	eos/effects/elitebonuscommandshipinformationhiddencs3.py
	eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
	eos/effects/energydestabilizationnew.py
	eos/effects/iceharvestingdroneoperationdurationbonus.py
	eos/effects/miningforemanstrengthbonus.py
	eos/effects/modulebonuswarfarelinkarmor.py
	eos/effects/modulebonuswarfarelinkinfo.py
	eos/effects/modulebonuswarfarelinkmining.py
	eos/effects/modulebonuswarfarelinkshield.py
	eos/effects/modulebonuswarfarelinkskirmish.py
	eos/effects/moduletitaneffectgenerator.py
	eos/effects/remotehullrepair.py
	eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
	eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
	eos/effects/shipmodesmallmissiledamagepostdiv.py
	eos/effects/structureenergyneutralizerfalloff.py
	eos/effects/structuremoduleeffectstasiswebifier.py
	eos/effects/structurerigmaxtargets.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
	eos/effects/techtwocommandburstbonus.py
	eos/saveddata/fighter.py
	eos/saveddata/fit.py
	eos/saveddata/module.py
	eve.db
	gui/bitmapLoader.py
	gui/builtinContextMenus/itemStats.py
	gui/builtinStatsViews/miningyieldViewFull.py
	gui/builtinViewColumns/misc.py
	gui/builtinViews/__init__.py
	gui/builtinViews/fittingView.py
	gui/contextMenu.py
	gui/graphFrame.py
	gui/itemStats.py
	gui/mainFrame.py
	gui/marketBrowser.py
	service/__init__.py
	service/character.py
	service/fit.py
	service/port.py
	service/prefetch.py
	service/pycrest/eve.py
	service/settings.py

2017-01-23 21:06:12 -05:00

..

__init__.py

Added column for fighter abilities, fixed some fighter bugs, added some context menus to them

2016-04-28 00:29:25 -04:00

abilities.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

ammo.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

ammoIcon.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

attributeDisplay.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

baseIcon.py

bajillion pep8 fixes to pass tox

2016-12-13 23:31:39 -08:00

baseName.py

bajillion pep8 fixes to pass tox

2016-12-13 23:31:39 -08:00

capacitorUse.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

maxRange.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

misc.py

oh god this isn't gonna work

2017-01-23 21:06:12 -05:00

price.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

propertyDisplay.py

bajillion pep8 fixes to pass tox

2016-12-13 23:31:39 -08:00

state.py

bajillion pep8 fixes to pass tox

2016-12-13 23:31:39 -08:00