Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/mimis into sound

Conflicts: .gitignore
2013-12-02 20:41:34 +00:00
parent 5b0d8bd977 1b005c69f5
commit e0ecdc998c
29 changed files with 39 additions and 29 deletions
--- a/java/mimis/build.gradle
+++ b/java/mimis/build.gradle
@@ -18,4 +18,10 @@ jar {
 	manifest {
 		attributes 'Main-Class': mainClass
 	}
+	dependsOn configurations.runtime
+	from {
+		configurations.runtime.collect {
+			it.isDirectory() ? it : zipTree(it)
+		}
+	}
 }
--- a/java/mimis/mimis.dll
+++ b/java/mimis/mimis.dll
--- a/java/mimis/wiiuse.dll
+++ b/java/mimis/wiiuse.dll
--- a/java/mimis/wiiusej.dll
+++ b/java/mimis/wiiusej.dll
--- a/java/wiiusej/wiiuse.dll
+++ b/java/wiiusej/wiiuse.dll
--- a/java/wiiusej/wiiusej.dll
+++ b/java/wiiusej/wiiusej.dll