blitzmann 48b45b5f51 Merge branch 'master' into charImplants ...

# Conflicts:
#	gui/characterEditor.py

2016-03-12 23:20:26 -05:00

..

gamedata

Bump Dev, and fix import errors (#474)

2015-12-13 22:26:36 -05:00

migrations

Add conversions, TODO: Confirm with some testing!

2016-03-05 15:41:39 -05:00

saveddata

Differentiate between character implants and fits

2015-11-10 02:06:44 -05:00

__init__.py

Load overrides from database

2015-11-01 15:00:09 -05:00

migration.py

Revert "Disable setting new database version and bump pre-release"

2016-03-08 16:55:03 -05:00

util.py

Set files to 644 besides pyfa.py and scripts

2014-07-30 21:23:27 -04:00