blitzmann
|
b30b3fcbf1
|
Merge branch 'master' into test-3
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
|
2017-11-23 11:19:05 -05:00 |
|
blitzmann
|
b55fcfaf04
|
cleanup
|
2017-07-11 02:06:09 -04:00 |
|
Ryan Holmes
|
8e4db5a8c3
|
Do some renaming of some files
|
2017-06-12 18:08:07 -04:00 |
|
Ryan Holmes
|
828b18d0fd
|
py2to3 automatic conversion. Woot!
|
2017-06-12 16:12:45 -04:00 |
|
Ryan Holmes
|
a7c89f7b40
|
break out market browser to individual class files
|
2017-06-11 17:54:36 -04:00 |
|