Skip to content

Commit 951f2ca

Browse files
author
davidkline-ms
committed
Merge remote-tracking branch 'upstream/prerelease/2.5.1_upm_stabilization' into moveSceneSysScenes
2 parents cbb4f09 + cb89e4b commit 951f2ca

File tree

6 files changed

+4
-0
lines changed

6 files changed

+4
-0
lines changed

Assets/MRTK/SDK/StandardAssets/Textures/IridescentSpectrum.png renamed to Assets/MRTK/StandardAssets/Textures/IridescentSpectrum.png

File renamed without changes.

Assets/MRTK/SDK/StandardAssets/Textures/IridescentSpectrum.png.meta renamed to Assets/MRTK/StandardAssets/Textures/IridescentSpectrum.png.meta

File renamed without changes.

Assets/MRTK/SDK/StandardAssets/Textures/IridescentSpectrumRainbow.png renamed to Assets/MRTK/StandardAssets/Textures/IridescentSpectrumRainbow.png

File renamed without changes.

Assets/MRTK/SDK/StandardAssets/Textures/IridescentSpectrumRainbow.png.meta renamed to Assets/MRTK/StandardAssets/Textures/IridescentSpectrumRainbow.png.meta

File renamed without changes.

Assets/MRTK/StandardAssets/packagetemplate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,8 @@
2525
},
2626
"bugs": {
2727
"url": "https://github.com/microsoft/MixedRealityToolkit-Unity/issues"
28+
},
29+
"dependencies": {
30+
"com.unity.textmeshpro": "2.1.1"
2831
}
2932
}

Documentation/Authors.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The Microsoft Mixed Reality Toolkit is a collaborative project containing contri
1414
- Austin Ha
1515
- Bertrand Oustrière
1616
- Bertrand75014
17+
- brandf
1718
- Cameron-Micka
1819
- CDiaz-MS
1920
- chbecker-ms

0 commit comments

Comments
 (0)