Merge pull request #56 from ikbenmacje/master

Updated XCode project files (the where corrupt after merge conflict)

MOCAP_CSV2OSC.xcodeproj/project.pbxproj

@@ -13,7 +13,7 @@
 			<dict>
 				<key>fileRef</key>
 				<string>FC5DA1C87211D4F6377DA719</string>
-				<key>isa</key>fatal: No tags can describe 
+				<key>isa</key>
 				<string>PBXBuildFile</string>
 			</dict>
 			<key>FC5DA1C87211D4F6377DA719</key>
@@ -1460,7 +1460,6 @@
 				<key>isa</key>
 				<string>PBXFileReference</string>
 				<key>name</key>
-
 				<string>BaseEngine.cpp</string>
 				<key>path</key>
 				<string>../../../addons/ofxImGui/src/BaseEngine.cpp</string>
@@ -2204,7 +2203,7 @@ fi
 					<string>5C2607C471F8D48C0036C56E</string>
 					<string>E984796BE84AA4315636B6E7</string>
 					<string>00413C35AAE31B483D7538AB</string>
-          <string>0090B479605B26E7C387B02D</string>
+					<string>0090B479605B26E7C387B02D</string>
 					<string>72A929D3561B8232A182ABFC</string>
 					<string>5864AD82E20F15536D054EA3</string>
 					<string>4ADB88E2FB52E76A471065DE</string>

MOCAP_CSV2OSC.xcodeproj/xcuserdata/machiel.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>E4B69B5A0A3A1756003C02F2</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>