rik/mimis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-wiipair' into develop

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Rik Veenboer
2013-07-20 16:11:33 +02:00
parent 2503233ced 0ea32724c3
commit 3b98295c75
4 changed files with 4 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -4,3 +4,7 @@
=======
/java/bin
>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
/cpp/wiipair/.settings
/cpp/wiipair/Release/src
/cpp/wiiusej/.settings
/cpp/wiipair/.settings