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

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

Binary file not shown.

BIN
cpp/wiiscan/lib/wiiuse.lib Normal file
View File

Binary file not shown.

6
cpp/wiiuse/.cproject
View File

@@ -13,7 +13,7 @@
<externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/Wiiuse"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/Wiiuse/Debug"/>
<entry flags="RESOLVED" kind="libraryFile" name="wiiuse"/>
<entry flags="RESOLVED" kind="libraryFile" name="wiiuse" srcPrefixMapping="" srcRootPath=""/>
</externalSetting>
</externalSettings>
<extensions>
@@ -87,7 +87,7 @@
<externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/Wiiuse"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/Wiiuse/Release"/>
<entry flags="RESOLVED" kind="libraryFile" name="wiiuse"/>
<entry flags="RESOLVED" kind="libraryFile" name="wiiuse" srcPrefixMapping="" srcRootPath=""/>
</externalSetting>
</externalSettings>
<extensions>
@@ -184,4 +184,6 @@
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
</cproject>

2
cpp/wiiuse/.project
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Wiiuse</name>
<name>Wiiuse library</name>
<comment></comment>
<projects>
</projects>

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

Binary file not shown.

BIN
cpp/wiiuse/Debug/wiiuse.lib Normal file
View File

Binary file not shown.