blitzmann 40ce7b7c0b Merge branch 'master' into test-3 ...

# Conflicts:
#	.gitignore
#	eos/saveddata/character.py
#	service/network.py
#	service/price.py

2017-12-10 22:36:15 -05:00

..

__init__.py

Remove platform-specific CREST checks (add for mac-deprecated client)

2017-11-24 17:27:44 -05:00

dummyView.py

Fix stretchspacers

2017-11-24 17:23:04 -05:00

pyfaContextMenuPreferences.py

Do some renaming of some files

2017-06-12 18:08:07 -04:00

pyfaCrestPreferences.py

Remove platform-specific CREST checks (add for mac-deprecated client)

2017-11-24 17:27:44 -05:00

pyfaDatabasePreferences.py

Fix stretchspacers

2017-11-24 17:23:04 -05:00

pyfaEnginePreferences.py

Deprecation stuff

2017-06-14 01:07:18 -04:00

pyfaGaugePreferences.py

code cleanup

2017-11-27 21:05:06 -05:00

pyfaGeneralPreferences.py

Merge branch 'master' into test-3

2017-12-10 22:36:15 -05:00

pyfaHTMLExportPreferences.py

code cleanup

2017-11-27 21:05:06 -05:00

pyfaLoggingPreferences.py

Do some renaming of some files

2017-06-12 18:08:07 -04:00

pyfaNetworkPreferences.py

Fix stretchspacers

2017-11-24 17:23:04 -05:00

pyfaStatViewPreferences.py

Do some renaming of some files

2017-06-12 18:08:07 -04:00

pyfaUpdatePreferences.py

Fix stretchspacers

2017-11-24 17:23:04 -05:00