blitzman 1d69ed7584 Merge branch 'test_import' into development ...

Conflicts:
	gui/builtinContextMenus/amount.py
	gui/characterEditor.py
	gui/itemStats.py

2017-01-27 20:39:54 -05:00

..

conversions

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

pycrest

tweaks to fix merge issues

2017-01-23 21:07:20 -05:00

__init__.py

Make it run again

2016-12-02 03:13:54 -08:00

attribute.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

character.py

Merge branch 'test_import' into development

2017-01-27 20:39:54 -05:00

crest.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

crudeTests.py

Fix energy warfare

2016-06-19 23:04:52 -04:00

damagePattern.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

eveapi.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

fit.py

Clean up another broken reference. Fix broken XML export.

2017-01-24 21:34:24 -08:00

implantSet.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

market.py

Remove comments about conversion

2017-01-25 17:39:54 -08:00

network.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

port.py

Fix fit import

2017-01-25 20:28:57 -05:00

prefetch.py

tweaks to fix merge issues

2017-01-23 21:07:20 -05:00

price.py

so many pep8 fixes

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

server.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

settings.py

oh god this isn't gonna work

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

targetResists.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

update.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00