# HG changeset patch
# User Henrik Ekeus <hekeus@eecs.qmul.ac.uk>
# Date 1328808589 0
# Node ID 199f47eb6fa380f27fd02b499330c95c54595f1e
# Parent  5ab35fbad51ac2f843d29b9c8e17dbf8eededa56# Parent  c265c6b3b98d8b47a5872a2a776eb5ea0d4bd7bc
Merge

diff -r c265c6b3b98d -r 199f47eb6fa3 groupTrackKinect.xcodeproj/hekeus.pbxuser
--- a/groupTrackKinect.xcodeproj/hekeus.pbxuser	Thu Feb 09 17:27:14 2012 +0000
+++ b/groupTrackKinect.xcodeproj/hekeus.pbxuser	Thu Feb 09 17:29:49 2012 +0000
@@ -211,7 +211,7 @@
 	E4B69B4C0A3A1720003C02F2 /* Project object */ = {
 		activeBuildConfigurationName = Release;
 		activeExecutable = C844C66E1354AB3D00313565 /* emptyExample */;
-		activeTarget = E4B69B5A0A3A1756003C02F2 /* emptyExample */;
+		activeTarget = E4B69B5A0A3A1756003C02F2 /* IdyomTracker */;
 		breakpoints = (
 			C83DAFF81354FD0000C5D49E /* ofxTrackedUser.h:30 */,
 		);
@@ -242,8 +242,8 @@
 					PBXFileDataSource_Target_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 326198346;
-			PBXWorkspaceStateSaveDate = 326198346;
+			PBXPerProjectTemplateStateSaveDate = 350501089;
+			PBXWorkspaceStateSaveDate = 350501089;
 		};
 		perUserProjectItems = {
 			C83DB0111355021400C5D49E = C83DB0111355021400C5D49E /* PlistBookmark */;
@@ -254,9 +254,9 @@
 			C8A6B7AC137062C3000293F7 = C8A6B7AC137062C3000293F7 /* PBXTextBookmark */;
 			C8A6B7AD137062C3000293F7 = C8A6B7AD137062C3000293F7 /* PBXTextBookmark */;
 			C8A6B7AE137062C3000293F7 = C8A6B7AE137062C3000293F7 /* PBXTextBookmark */;
-			C8B11C0C1371645D00367359 /* PBXTextBookmark */ = C8B11C0C1371645D00367359 /* PBXTextBookmark */;
-			C8B11C0F1371645D00367359 /* PBXTextBookmark */ = C8B11C0F1371645D00367359 /* PBXTextBookmark */;
-			C8B11C101371645D00367359 /* PBXTextBookmark */ = C8B11C101371645D00367359 /* PBXTextBookmark */;
+			C8B11C0C1371645D00367359 = C8B11C0C1371645D00367359 /* PBXTextBookmark */;
+			C8B11C0F1371645D00367359 = C8B11C0F1371645D00367359 /* PBXTextBookmark */;
+			C8B11C101371645D00367359 = C8B11C101371645D00367359 /* PBXTextBookmark */;
 			C8E247D91369A99400217625 = C8E247D91369A99400217625 /* PBXTextBookmark */;
 			C8E247FB1369B03500217625 = C8E247FB1369B03500217625 /* PBXTextBookmark */;
 		};
@@ -264,7 +264,7 @@
 		userBuildSettings = {
 		};
 	};
-	E4B69B5A0A3A1756003C02F2 /* emptyExample */ = {
+	E4B69B5A0A3A1756003C02F2 /* IdyomTracker */ = {
 		activeExec = 0;
 		executables = (
 			C844C66E1354AB3D00313565 /* emptyExample */,