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/OSX/ofMaximExample007OSX_Granular/.vcproj.user | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/.vcproj.user')
| -rw-r--r-- | ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/.vcproj.user | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/.vcproj.user b/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/.vcproj.user deleted file mode 100644 index 801522b..0000000 --- a/ofxMaxim/examples/OSX/ofMaximExample007OSX_Granular/.vcproj.user +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioUserFile - ProjectType="Visual C++" - Version="8.00" - ShowAllFiles="false" - > - <Configurations> - <Configuration - Name="Debug|Win32" - > - <DebugSettings - Command="$(TargetPath)" - WorkingDirectory="bin" - /> - </Configuration> - <Configuration - Name="Release|Win32" - > - <DebugSettings - Command="$(TargetPath)" - WorkingDirectory="bin" - /> - </Configuration> - </Configurations> -</VisualStudioUserFile> |