Merge branch 'master' into story77

# Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/model/View3D.java
2017-09-08 17:28:17 +12:00
parent 4780354452 321359be07
commit 4c2ab9cc9a
79 changed files with 2957 additions and 663 deletions
@@ -15,4 +15,12 @@

    <url>https://eng-git.canterbury.ac.nz/SENG302-2016/team-7</url>

+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven Central</name>
+            <url>http://repo1.maven.org/maven2/</url>
+        </repository>
+    </repositories>
+
 </project>