Solargale 3beb1ff33d Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.

2019-04-06 14:00:33 -06:00

..

compiler.xml

new updated project

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

cssdialects.xml

Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.

2019-04-06 14:00:33 -06:00

description.html

new updated project

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

encodings.xml

Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.

2019-04-06 14:00:33 -06:00

misc.xml

Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.

2019-04-06 14:00:33 -06: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

Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.

2019-04-06 14:00:33 -06:00