Merge branch 'develop-mimis' into develop

2013-07-20 16:19:32 +02:00
parent ebb9a9098f b24cf725bf
commit 164a8354cc
4 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 =======
 /cpp/wiiuse/Debug/src
 >>>>>>> develop-wiiuse
 /cpp/mimis/Debug/src
--- 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/java/mimis.dll
+++ b/java/mimis.dll