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/mimis into sound

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Rik Veenboer
2013-12-02 20:41:34 +00:00
parent 5b0d8bd977 1b005c69f5
commit e0ecdc998c
29 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -1,7 +1,9 @@
bin
Debug/src
Release/src
.gradle
.settings
build
<<<<<<< HEAD
/cpp/pipe/Release/src
=======
src
>>>>>>> 1b005c69f5ba5b443ef5addc6aad13236196f3dc