Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D

2017-08-29 20:36:15 +12:00
parent ea41c64c34 1b1b0a4591
commit 43ec179d79
51 changed files with 189 additions and 2047 deletions
@@ -4,13 +4,13 @@
    <parent>
        <groupId>seng302</groupId>
        <artifactId>team-7</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.0</version>
    </parent>

    <packaging>jar</packaging>
    <name>racevisionGame</name>
    <artifactId>racevisionGame</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0</version>

    <dependencies>
        <dependency>