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

Merge branch 'develop-wiipair' into develop

Browse Source 
Conflicts:
	cpp/wiipair/.settings/org.eclipse.cdt.managedbuilder.core.prefs
This commit is contained in:
Rik Veenboer
2013-03-22 18:00:33 +01:00
parent eef466bfc2 9c0dc8e3f0
commit 4897fa7024
26 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
cpp/Wiipair/.cproject → cpp/wiipair/.cproject
View File

0
cpp/Wiipair/.project → cpp/wiipair/.project
View File

25
cpp/wiipair/.settings/org.eclipse.cdt.managedbuilder.core.prefs Normal file
View File

@@ -0,0 +1,25 @@
eclipse.preferences.version=1
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/CPATH/delimiter=;
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/CPATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/CPLUS_INCLUDE_PATH/delimiter=;
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/CPLUS_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/C_INCLUDE_PATH/delimiter=;
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/append=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/appendContributed=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/CPATH/delimiter=;
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/CPATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/CPLUS_INCLUDE_PATH/delimiter=;
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/CPLUS_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/C_INCLUDE_PATH/delimiter=;
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/C_INCLUDE_PATH/operation=remove
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/append=true
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/appendContributed=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/LIBRARY_PATH/delimiter=;
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/LIBRARY_PATH/operation=remove
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/append=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.1313294112/appendContributed=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/LIBRARY_PATH/delimiter=;
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/LIBRARY_PATH/operation=remove
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/append=true
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.release.1147005981/appendContributed=true

0
cpp/Wiipair/Debug/wiipair.exe → cpp/wiipair/Debug/wiipair.exe
View File

0
cpp/Wiipair/Release/wiipair.exe → cpp/wiipair/Release/wiipair.exe
View File

0
cpp/Wiipair/include/BluetoothAPIs.h → cpp/wiipair/include/BluetoothAPIs.h
View File

0
cpp/Wiipair/include/bthdef.h → cpp/wiipair/include/bthdef.h
View File

0
cpp/Wiipair/include/bthsdpdef.h → cpp/wiipair/include/bthsdpdef.h
View File

0
cpp/Wiipair/include/strsafe.h → cpp/wiipair/include/strsafe.h
View File

0
cpp/Wiipair/lib/DelcomDLL.lib → cpp/wiipair/lib/DelcomDLL.lib
View File

0
cpp/Wiipair/lib/advapi32.lib → cpp/wiipair/lib/advapi32.lib
View File

0
cpp/Wiipair/lib/comdlg32.lib → cpp/wiipair/lib/comdlg32.lib
View File

0
cpp/Wiipair/lib/gdi32.lib → cpp/wiipair/lib/gdi32.lib
View File

0
cpp/Wiipair/lib/irprops.lib → cpp/wiipair/lib/irprops.lib
View File

0
cpp/Wiipair/lib/kernel32.lib → cpp/wiipair/lib/kernel32.lib
View File

0
cpp/Wiipair/lib/libcpmt.lib → cpp/wiipair/lib/libcpmt.lib
View File

0
cpp/Wiipair/lib/odbc32.lib → cpp/wiipair/lib/odbc32.lib
View File

0
cpp/Wiipair/lib/odbccp32.lib → cpp/wiipair/lib/odbccp32.lib
View File

0
cpp/Wiipair/lib/ole32.lib → cpp/wiipair/lib/ole32.lib
View File

0
cpp/Wiipair/lib/oleaut32.lib → cpp/wiipair/lib/oleaut32.lib
View File

0
cpp/Wiipair/lib/shell32.lib → cpp/wiipair/lib/shell32.lib
View File

0
cpp/Wiipair/lib/user32.lib → cpp/wiipair/lib/user32.lib
View File

0
cpp/Wiipair/lib/uuid.lib → cpp/wiipair/lib/uuid.lib
View File

0
cpp/Wiipair/lib/wiiuse.lib → cpp/wiipair/lib/wiiuse.lib
View File

0
cpp/Wiipair/lib/winspool.lib → cpp/wiipair/lib/winspool.lib
View File

0
cpp/Wiipair/src/wiipair.cpp → cpp/wiipair/src/wiipair.cpp
View File