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

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

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Rik Veenboer
2013-07-20 16:12:43 +02:00
parent 3b98295c75 4e677fe757
commit 7bb42d70d9
18 changed files with 443 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

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