Merge branch 'fixMusic'

evertvorster · Mar 3, 2017 · d05f243 · d05f243
2 parents e0e158f + e0d111b
commit d05f243
Show file tree

Hide file tree

Showing 66 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 archives/
+bin/
diff --git a/data/.vegastrike/aera.m3u b/data/.vegastrike/aera.m3u
@@ -1,2 +1,2 @@
 #EXTM3U
-../music/aerapeace.ogg
+../music/aerapeace.ogg