Merge branch 'master' into gui

2014-05-11 01:46:12 +02:00
parent 41177581c6 6e6a115ac3
commit b6372d44b8
3 changed files with 5 additions and 1 deletions
@@ -31,5 +31,4 @@ ipch/
 Ankh.NoLoad
 *.orig

-assets/
 !libs/*.lib
@@ -0,0 +1,4 @@
+[submodule "assets"]
+	path = assets
+	url = returngeance@shard.imon.nu:Assets
+	branch = master