Skip to content

Commit 9f5bea7

Browse files
author
David Kline
authored
Merge pull request #2575 from Microsoft/mrtk_development
MRTK vNext v2018.7 release branch refresh
2 parents 9f37dae + fb9748a commit 9f5bea7

File tree

1,034 files changed

+63620
-13216
lines changed

Some content is hidden

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

1,034 files changed

+63620
-13216
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ Assets/ThirdParty/
4545
Assets/ThirdParty.meta
4646

4747
artifacts/
48+
Assets/TextMesh Pro.meta
49+
Assets/TextMesh Pro/

Assets/MixedRealityToolkit-Examples.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit-Examples/Demos.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit/_Core/Boundary.meta Assets/MixedRealityToolkit-Examples/Demos/Boundary.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit-SDK/Features/Input/Animations/Cursor.meta Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scenes.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)