diff options
| author | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
|---|---|---|
| committer | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
| commit | e4eb667af04304cbe9c0be5997ebea2049178590 (patch) | |
| tree | 5630e70df8199c9f53170c9ef4da1e4dac59e69c /ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user')
| -rwxr-xr-x | ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user b/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user deleted file mode 100755 index 3f1e743..0000000 --- a/ofxMaxim/examples/windows/ofMaximExampleVS2010/audioOutputExample.vcxproj.user +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory> - <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory> - <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> - </PropertyGroup> -</Project>
\ No newline at end of file |