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

..

__init__.py

Get alpha clones in the database

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

alphaClones.py

Get skill limits working

2016-12-11 20:26:30 -05:00

attribute.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00

category.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00

effect.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00

group.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00

icon.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00

item.py

bajillion pep8 fixes to pass tox

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

marketGroup.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00

metaData.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00

metaGroup.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00

queries.py

Merge branch 'test_import' into development

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

traits.py

remove trailing semicolon

2016-10-19 11:51:12 -07:00

unit.py

Revert "Revert "Reformatting eos.db.gamedata""

2016-10-19 11:26:40 -07:00