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

Conflicts: java/settings.gradle
2013-12-02 20:45:46 +00:00
parent e0ecdc998c 82b66ba73e
commit 4192794e69
168 changed files with 23737 additions and 387 deletions
--- a/cpp/mimis/Debug/mimis.dll
+++ b/cpp/mimis/Debug/mimis.dll
--- a/cpp/mimis/Release/mimis.dll
+++ b/cpp/mimis/Release/mimis.dll
--- a/cpp/wiipair/Debug/wiipair.exe
+++ b/cpp/wiipair/Debug/wiipair.exe
--- a/cpp/wiipair/lib/wiiuse.lib
+++ b/cpp/wiipair/lib/wiiuse.lib
--- a/cpp/wiiscan/lib/wiiuse.lib
+++ b/cpp/wiiscan/lib/wiiuse.lib
--- a/cpp/wiiuse/Debug/wiiuse.dll
+++ b/cpp/wiiuse/Debug/wiiuse.dll
--- a/cpp/wiiuse/Debug/wiiuse.lib
+++ b/cpp/wiiuse/Debug/wiiuse.lib
--- a/cpp/wiiusej/Debug/wiiusej.dll
+++ b/cpp/wiiusej/Debug/wiiusej.dll
--- a/cpp/wiiusej/lib/wiiuse.lib
+++ b/cpp/wiiusej/lib/wiiuse.lib