Solargale b945cafe98 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	.idea/workspace.xml

2019-03-09 23:27:03 -07:00

..

compiler.xml

new updated project

2019-02-17 19:13:24 -07:00

description.html

new updated project

2019-02-17 19:13:24 -07:00

encodings.xml

new updated project

2019-02-17 19:13:24 -07:00

misc.xml

Finished TravelGUI and StartGUI

2019-03-09 23:26:25 -07:00

modules.xml

new updated project

2019-02-17 19:13:24 -07:00

uiDesigner.xml

Created Player class

2019-02-18 18:47:00 -07:00

vcs.xml

This should fix the ShipWarfare file and bring it up to date with the rest of the file.

2019-02-17 19:54:29 -07:00

workspace.xml

Finished TravelGUI and StartGUI

2019-03-09 23:26:25 -07:00