Merge branch 'develop-wiipair' into develop

2013-05-11 21:07:02 +02:00
parent 4897fa7024 ea003a818c
commit 1e8c362f01
2 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
 /cpp/wiipair/.settings
 /cpp/wiipair/Release/src
--- a/cpp/wiipair/Release/wiipair.exe
+++ b/cpp/wiipair/Release/wiipair.exe