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

Merge branch 'develop-wiiuse' into develop

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Rik Veenboer
2013-05-11 21:18:00 +02:00
parent 28f1e2d994 40983d480a
commit 3d06b0731d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,6 +1,10 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
/cpp/wiipair/.settings /cpp/wiipair/.settings
/cpp/wiipair/Release/src /cpp/wiipair/Release/src
======= =======
/java/bin /java/bin
>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8 >>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
=======
/cpp/wiiuse/Debug/src
>>>>>>> develop-wiiuse