Merge branch 'develop' into develop-java

2013-05-22 14:46:56 +02:00
parent c9d82ef8e8 eeda858f97
commit 9d3eabb91c
7 changed files with 9 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,10 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+/cpp/wiipair/.settings
+/cpp/wiipair/Release/src
+=======
 /java/bin
+>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
+=======
+/cpp/wiiuse/Debug/src
+>>>>>>> develop-wiiuse
--- a/cpp/mimis/wiiuse.dll
+++ b/cpp/mimis/wiiuse.dll
--- a/cpp/wiipair/Release/wiipair.exe
+++ b/cpp/wiipair/Release/wiipair.exe
--- 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/vendor/commons-collections/commons-collections-3.2.1.jar
+++ b/vendor/commons-collections/commons-collections-3.2.1.jar