Skip to content

Commit 212305d

Browse files
Merge branch 'mrtk_development' into vNEXT-TeleportationMove
# Conflicts: # Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoConfigurationProfile.asset
2 parents 91ec449 + db2dba5 commit 212305d

File tree

41 files changed

+552
-574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+552
-574
lines changed

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoConfigurationProfile.asset

Lines changed: 0 additions & 46 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoConfigurationProfile.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoDiagnosticsProfile.asset

Lines changed: 0 additions & 18 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoDiagnosticsProfile.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoInputActionsProfile.asset

Lines changed: 0 additions & 27 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoInputActionsProfile.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoInputSystemProfile.asset

Lines changed: 0 additions & 27 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoInputSystemProfile.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoSpeechCommandsProfile.asset

Lines changed: 0 additions & 41 deletions
This file was deleted.

Assets/MixedRealityToolkit-Examples/Demos/Diagnostics/Profiles/DiagnosticsDemoSpeechCommandsProfile.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)