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/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/ofxiOS_Prefix.pch | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'ofxMaxim/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/ofxiOS_Prefix.pch')
| -rwxr-xr-x | ofxMaxim/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/ofxiOS_Prefix.pch | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ofxMaxim/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/ofxiOS_Prefix.pch b/ofxMaxim/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/ofxiOS_Prefix.pch new file mode 100755 index 0000000..fd3401c --- /dev/null +++ b/ofxMaxim/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/ofxiOS_Prefix.pch @@ -0,0 +1,8 @@ +// +// Prefix header for all source files of the 'iPhone' target in the 'iPhone' project +// + +#ifdef __OBJC__ + #import <Foundation/Foundation.h> + #import <UIKit/UIKit.h> +#endif |