Merge pull request #2575 from Microsoft/mrtk_development

MRTK vNext v2018.7 release branch refresh
microsoft · Aug 9, 2018 · 9f5bea7 · 9f5bea7
2 parents 9f37dae + fb9748a
commit 9f5bea7
Show file tree

Hide file tree

Showing 1,034 changed files with 63,620 additions and 13,216 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,5 @@ Assets/ThirdParty/
 Assets/ThirdParty.meta
 
 artifacts/
+Assets/TextMesh Pro.meta
+Assets/TextMesh Pro/
diff --git a/Assets/MixedRealityToolkit-Examples.meta b/Assets/MixedRealityToolkit-Examples.meta
diff --git a/Assets/MixedRealityToolkit-Examples/Demos.meta b/Assets/MixedRealityToolkit-Examples/Demos.meta
diff --git a/...s/MixedRealityToolkit/_Core/Boundary.meta → ...alityToolkit-Examples/Demos/Boundary.meta b/...s/MixedRealityToolkit/_Core/Boundary.meta → ...alityToolkit-Examples/Demos/Boundary.meta
diff --git a/...SDK/Features/Input/Animations/Cursor.meta → ...olkit-Examples/Demos/Boundary/Scenes.meta b/...SDK/Features/Input/Animations/Cursor.meta → ...olkit-Examples/Demos/Boundary/Scenes.meta