blitzman fbb1750528 Merge branch 'master' into singularity ...

Conflicts:
	eos/db/saveddata/fit.py
	gui/additionsPane.py

2016-11-20 20:52:23 -05:00

..

__init__.py

Set files to 644 besides pyfa.py and scripts

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

booster.py

lots of PEP8 cleanup

2016-10-19 12:25:31 -07:00

cargo.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

character.py

Revert "Create variables before they are referenced. "

2016-11-04 14:18:18 -07:00

citadel.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

crestchar.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

damagePattern.py

Revert "Create variables before they are referenced. "

2016-11-04 14:18:18 -07:00

drone.py

lots of PEP8 cleanup

2016-10-19 12:25:31 -07:00

fighter.py

Revert "Create variables before they are referenced. "

2016-11-04 14:18:18 -07:00

fighterAbility.py

Revert "Create variables before they are referenced. "

2016-11-04 14:18:18 -07:00

fit.py

Merge branch 'master' into singularity

2016-11-20 20:52:23 -05:00

fleet.py

lots of PEP8 cleanup

2016-10-19 12:25:31 -07:00

implant.py

Even more PEP8 cleanup

2016-10-19 12:29:33 -07:00

implantSet.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

miscData.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

mode.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

module.py

Merge branch 'master' into singularity

2016-11-20 14:42:19 -05:00

override.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

price.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

ship.py

more PEP8 cleanup

2016-10-19 12:26:03 -07:00

targetResists.py

Revert "Create variables before they are referenced. "

2016-11-04 14:18:18 -07:00

user.py

more PEP8 cleanup

2016-10-19 12:26:03 -07:00