blitzman f7d7b3fe5e Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development ...

Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py

2017-02-07 19:22:26 -05:00

..

builtinContextMenus

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

2017-02-07 19:22:26 -05:00

builtinGraphs

Line endings again

2017-02-07 19:07:22 -05:00

builtinPreferenceViews

Tox fixes

2017-02-05 15:39:07 -08:00

builtinStatsViews

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

2017-02-07 19:22:26 -05:00

builtinViewColumns

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

2017-02-07 19:22:26 -05:00

builtinViews

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

2017-02-07 19:22:26 -05:00

utils

Merge branch 'master' into development

2017-01-29 15:02:22 -05:00

__init__.py

Add basic files.

2010-08-11 18:57:14 +02:00

aboutData.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

additionsPane.py

working commit

2016-12-18 09:45:26 -05:00

bitmapLoader.py

Merge branch 'test_import' into development

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

boosterView.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

cachingImageList.py

.gitattributes fixing line endings

2017-02-05 15:39:23 -08:00

cargoView.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

characterEditor.py

Merge branch 'test_import' into development

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

characterSelection.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

chromeTabs.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

commandView.py

bajillion pep8 fixes to pass tox

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

contextMenu.py

Clean up new tactical mode stats stuff

2016-12-14 12:21:00 -08:00

copySelectDialog.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

crestFittings.py

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

2017-02-07 19:22:26 -05:00

display.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

droneView.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

fighterView.py

Burn types with fire

2017-01-09 22:36:19 -08:00

globalEvents.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

graph.py

I can't get these files out of "modified". Just commit them to get them out of the way.

2017-02-05 17:56:36 -05:00

graphFrame.py

import changes to graphframe

2017-02-07 00:33:15 -05:00

implantView.py

Burn types with fire

2017-01-09 22:36:19 -08:00

itemStats.py

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

2017-02-07 19:22:26 -05:00

mainFrame.py

Remove circular import mainFrame <> mainMenuBar

2017-02-07 09:37:20 -05:00

mainMenuBar.py

Remove circular import mainFrame <> mainMenuBar

2017-02-07 09:37:20 -05:00

marketBrowser.py

Tox fixes

2017-02-05 15:39:07 -08:00

multiSwitch.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

notesView.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

patternEditor.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

PFListPane.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

PFSearchBox.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

preferenceDialog.py

I can't get these files out of "modified". Just commit them to get them out of the way.

2017-02-05 17:56:36 -05:00

preferenceView.py

I can't get these files out of "modified". Just commit them to get them out of the way.

2017-02-05 17:56:36 -05:00

projectedView.py

bajillion pep8 fixes to pass tox

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

propertyEditor.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

pyfatogglepanel.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

pygauge.py

Make some imports more explicit

2016-12-13 23:49:37 -08:00

resistsEditor.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

setEditor.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

sfBrowserItem.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

shipBrowser.py

oh god this isn't gonna work

2017-01-23 21:06:12 -05:00

statsPane.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

statsView.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

updateDialog.py

Make some imports more explicit

2016-12-13 23:49:37 -08:00

viewColumn.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00