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-05-11 21:14:40 +02:00
parent 1e8c362f01 c9d82ef8e8
commit 2503233ced
3 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,2 +1,6 @@
<<<<<<< HEAD
/cpp/wiipair/.settings
/cpp/wiipair/Release/src
=======
/java/bin
>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8