Skip to content

Commit 858bb76

Browse files
Merge branch 'vNEXT-TouchScreenInputSourceUpdate' into vNEXT-SpatialMouse
2 parents e738595 + 0064f50 commit 858bb76

File tree

49 files changed

+1285
-41
lines changed

Some content is hidden

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

49 files changed

+1285
-41
lines changed

Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Models/ShaderBall.FBX.meta

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

Assets/MixedRealityToolkit-Examples/StandardAssets/Models.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-Examples/StandardAssets/Models/Prototyping.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.

0 commit comments

Comments
 (0)