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

2013-05-11 21:17:33 +02:00
parent 0c6aa57c9a 2503233ced
commit 28f1e2d994
4 changed files with 6 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,6 @@
+<<<<<<< HEAD
+/cpp/wiipair/.settings
+/cpp/wiipair/Release/src
+=======
+/java/bin
+>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
--- a/cpp/wiipair/Release/wiipair.exe
+++ b/cpp/wiipair/Release/wiipair.exe
--- a/java/client.jar
+++ b/java/client.jar
--- a/java/main.jar
+++ b/java/main.jar