blitzmann 48f96a7a32 Merge branch 'master' into wx3 ...

Conflicts:
	config.py
	staticdata/icons/icon01_08.png
	staticdata/icons/icon02_11.png
	staticdata/icons/icon105_46.png
	staticdata/icons/icon105_47.png
	staticdata/icons/icon105_48.png
	staticdata/icons/icon105_49.png
	staticdata/icons/icon108_5.png
	staticdata/icons/icon113_64_1.png
	staticdata/icons/icon113_64_2.png
	staticdata/icons/icon113_64_3.png
	staticdata/icons/icon34_16.png
	staticdata/icons/iconMarketIcon_16px_Amarr.png
	staticdata/icons/iconMarketIcon_16px_Caldari.png
	staticdata/icons/iconMarketIcon_16px_Gallente.png
	staticdata/icons/iconMarketIcon_16px_Minmatar.png

2015-08-15 10:50:58 -04:00

..

__init__.py

Rename column from tracking to misc and change its icon to data disk

2012-03-18 15:06:35 +04:00

ammo.py

Resolve #245 - Adding tooltips to fitting columns

2015-01-08 12:39:16 -05:00

ammoIcon.py

Revert "Revert "Merge branch 'master' into wx3"". So many reverts.

2015-06-27 21:53:59 -04:00

attributeDisplay.py

Resolve #245 - Adding tooltips to fitting columns

2015-01-08 12:39:16 -05:00

baseIcon.py

Revert "Revert "Merge branch 'master' into wx3"". So many reverts.

2015-06-27 21:53:59 -04:00

baseName.py

Fix graphing

2015-07-22 13:12:57 -04:00

capacitorUse.py

Resolve #245 - Adding tooltips to fitting columns

2015-01-08 12:39:16 -05:00

maxRange.py

Resolve #245 - Adding tooltips to fitting columns

2015-01-08 12:39:16 -05:00

misc.py

Add consumption info for siege/cyno module in misc column (resolves #219)

2014-12-13 18:39:06 -05:00

price.py

Return None for price column on ship modes, fixes #322

2015-07-09 12:13:13 -04:00

propertyDisplay.py

Code consistency

2014-07-31 00:14:29 -04:00

state.py

Fixes critical design issue when it comes to projected fits. Disabled some of the more advanced functionality (projection amount and active) to cope to development. Crash still happens occasionally when adding projected fit for unknown reasons - not 100% reproducable yet

2015-07-09 17:53:41 -04:00