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
	cpp/mimis/wiiuse.dll
This commit is contained in:
Rik Veenboer
2013-07-20 16:26:45 +02:00
parent 625275e5c9 3de0693b1c
commit e42f5ff3e0
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.gitignore vendored
View File

@@ -1,8 +1,13 @@
/cpp/wiipair/.settings
/cpp/wiipair/Release/src
/java/bin /java/bin
/cpp/wiiuse/Debug/src
/cpp/wiipair/.settings /cpp/wiipair/.settings
/cpp/wiipair/Debug/src
/cpp/wiipair/Release/src /cpp/wiipair/Release/src
/cpp/wiiuse/.settings
/cpp/wiiuse/Debug/src /cpp/wiiuse/Debug/src
/cpp/wiiuse/Release/src
/cpp/wiiusej/.settings
/cpp/wiiusej/Debug/src
/cpp/wiiusej/Release/src
/cpp/mimis/.settings
/cpp/mimis/Debug/src
/cpp/mimis/Release/src

BIN
cpp/mimis/wiiuse.dll Normal file
View File

Binary file not shown.