🔀 Merge: with dev_ARKit

dev_vm
Nathan VERDIER 10 months ago
parent 950cfe3546
commit 57e3bd04cf

@ -99,13 +99,6 @@
remoteGlobalIDString = 645834572BF5F92300E18321;
remoteInfo = DouShouQi_App;
};
ECF3FD212C2582B300F5E62B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = ECF3FD1D2C2582B300F5E62B /* ArKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = ECF3FD0A2C2582B200F5E62B;
remoteInfo = ArKit;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@ -194,7 +187,6 @@
ECCBA6C22C29C25000D6D9FB /* ARKitUIViewBoard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARKitUIViewBoard.swift; sourceTree = "<group>"; };
ECCBA6C42C29C2F500D6D9FB /* ARKitViewRepresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARKitViewRepresentable.swift; sourceTree = "<group>"; };
ECE777132C2068F400D354B0 /* EditPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditPlayerView.swift; sourceTree = "<group>"; };
ECF3FD1D2C2582B300F5E62B /* ArKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ArKit.xcodeproj; path = ../../Swift/ArKit/ArKit.xcodeproj; sourceTree = "<group>"; };
ECF3FD302C2722C600F5E62B /* CDHistoriqueExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CDHistoriqueExtension.swift; sourceTree = "<group>"; };
ECF3FD322C27238F00F5E62B /* Historique.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Historique.swift; sourceTree = "<group>"; };
ECF3FD392C29A20D00F5E62B /* HistoricListVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricListVM.swift; sourceTree = "<group>"; };
@ -239,7 +231,6 @@
6458344F2BF5F92300E18321 = {
isa = PBXGroup;
children = (
ECF3FD1D2C2582B300F5E62B /* ArKit.xcodeproj */,
6458345A2BF5F92300E18321 /* DouShouQi_App */,
6458346B2BF5F92600E18321 /* DouShouQi_AppTests */,
645834752BF5F92600E18321 /* DouShouQi_AppUITests */,
@ -550,14 +541,6 @@
path = CoreData;
sourceTree = "<group>";
};
ECF3FD1E2C2582B300F5E62B /* Products */ = {
isa = PBXGroup;
children = (
ECF3FD222C2582B300F5E62B /* ArKit.app */,
);
name = Products;
sourceTree = "<group>";
};
ECF3FD3B2C29A21200F5E62B /* Historic */ = {
isa = PBXGroup;
children = (
@ -656,12 +639,6 @@
mainGroup = 6458344F2BF5F92300E18321;
productRefGroup = 645834592BF5F92300E18321 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = ECF3FD1E2C2582B300F5E62B /* Products */;
ProjectRef = ECF3FD1D2C2582B300F5E62B /* ArKit.xcodeproj */;
},
);
projectRoot = "";
targets = (
645834572BF5F92300E18321 /* DouShouQi_App */,
@ -671,16 +648,6 @@
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
ECF3FD222C2582B300F5E62B /* ArKit.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
path = ArKit.app;
remoteRef = ECF3FD212C2582B300F5E62B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
645834562BF5F92300E18321 /* Resources */ = {
isa = PBXResourcesBuildPhase;

Loading…
Cancel
Save