diff options
| author | Chris Kiefer <chrisk13fer@gmail.com> | 2012-02-22 12:10:20 +0000 |
|---|---|---|
| committer | Chris Kiefer <chrisk13fer@gmail.com> | 2012-02-22 12:10:20 +0000 |
| commit | 0c65d2ad2162db3ffbea3e3175675ad4b4598688 (patch) | |
| tree | 5b1d6bd8b9dbe4069b8bf1a9bddb374d957c2cab /ofxMaxim/ofMaximExample007OSX/.vcproj.user | |
| parent | 9f073116e8b21af58415204edecf42fec5f2c3ed (diff) | |
| parent | bb60cd352f53f4600913d2152032dd4aff228520 (diff) | |
resolved merge conflicts
Diffstat (limited to 'ofxMaxim/ofMaximExample007OSX/.vcproj.user')
| -rw-r--r-- | ofxMaxim/ofMaximExample007OSX/.vcproj.user | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/ofxMaxim/ofMaximExample007OSX/.vcproj.user b/ofxMaxim/ofMaximExample007OSX/.vcproj.user deleted file mode 100644 index 801522b..0000000 --- a/ofxMaxim/ofMaximExample007OSX/.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> |