fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into story77

Browse Source 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
#	settings/keyBindings.xml
This commit is contained in:
hba56
2017-09-13 16:13:14 +12:00
parent 22b4b66049 7b97e93d3a
commit fd120edaf9
43 changed files with 910 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
-2
View File
@@ -11,8 +11,6 @@ import mock.exceptions.EventConstructionException;
import visualiser.app.App;
import java.io.IOException;
import java.net.DatagramSocket;
import java.net.Socket;
/**
* Controller for the opening title window.