Merge branch 'master' of github.com:ata4/disunity

Conflicts: disunity-core/src/main/java/info/ata4/disunity/extract/AudioClipExtractor.java disunity-core/src/main/java/info/ata4/unity/asset/AssetFile.java disunity-core/src/main/java/info/ata4/unity/asset/ObjectInfo.java disunity-dist/pom.xml pom.xml
ata4 · Jan 16, 2016 · dd5480d · dd5480d
2 parents 4ba535e + 1f78088
commit dd5480d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/disunity-dist/pom.xml b/disunity-dist/pom.xml
@@ -55,4 +55,4 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
-</project>
+</project>