Skip to content

Commit f4d0e35

Browse files
Merge branch 'mrtk_development' into vNEXT-CopyProfiles
# Conflicts: # Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityBaseConfigurationProfileInspector.cs
2 parents 2ee6c96 + a0fc18f commit f4d0e35

File tree

5 files changed

+47
-42
lines changed

5 files changed

+47
-42
lines changed

Assets/MixedRealityToolkit/MixedRealityToolkit.asmdef

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "Microsoft.MixedReality.Toolkit",
33
"references": [
44
"Microsoft.MixedReality.Toolkit.Core.Utilities.Editor",
5-
"Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities.Editor"
5+
"Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities.Editor",
6+
"Microsoft.MixedReality.Toolkit.Core.Utilities.Editor.Setup"
67
],
78
"optionalUnityReferences": [],
89
"includePlatforms": [],

0 commit comments

Comments
 (0)