blitzmann faed0ce159 Merge remote-tracking branch 'origin/master' into citadel ...

Conflicts:
	config.py

2016-07-16 21:45:28 -04:00

..

__init__.py

…

capacitorViewFull.py

Change to use BitmapLoader class

2015-09-24 12:21:50 -04:00

firepowerViewFull.py

Change to use BitmapLoader class

2015-09-24 12:21:50 -04:00

miningyieldViewFull.py

Change to use BitmapLoader class

2015-09-24 12:21:50 -04:00

priceViewFull.py

Add fighters to overall fitting price (#674)

2016-07-05 23:34:19 -04:00

rechargeViewFull.py

Change to use BitmapLoader class

2015-09-24 12:21:50 -04:00

resistancesViewFull.py

Allow EHP toggle to persist between fits (#641)

2016-06-19 23:50:42 -04:00

resourcesViewFull.py

Removing debugging

2016-04-28 00:42:09 -04:00

targetingMiscViewFull.py

Disable fit add on pages based on context (ship vs citadel)

2016-07-04 10:30:04 -04:00