Skip to content

Commit 8b05e1c

Browse files
artsouflMSartsouflMS
authored
Merge pull request #7 from microsoft/mrtk_development
Pull latest changes
2 parents b21a6e1 + 9091059 commit 8b05e1c

File tree

12 files changed

+1609
-1672
lines changed

12 files changed

+1609
-1672
lines changed

‎Assets/MixedRealityToolkit.Tools/BuildWindow.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Tools/BuildWindow/BuildDeployWindow.cs‎

Lines changed: 1509 additions & 0 deletions
Large diffs are not rendered by default.

Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/BuildDeployWindow.cs.meta renamed to Assets/MixedRealityToolkit.Tools/BuildWindow/BuildDeployWindow.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Tools/Microsoft.MixedReality.Toolkit.Tools.asmdef‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"Microsoft.MixedReality.Toolkit.Editor.Inspectors",
66
"Microsoft.MixedReality.Toolkit.Editor.Utilities",
77
"Microsoft.MixedReality.Toolkit.Tools.Runtime",
8-
"Unity.TextMeshPro"
8+
"Unity.TextMeshPro",
9+
"Microsoft.MixedReality.Toolkit.Editor.BuildAndDeploy"
910
],
1011
"optionalUnityReferences": [],
1112
"includePlatforms": [

0 commit comments

Comments
 (0)