Skip to content

Commit dc973d2

Browse files
NeerajWNeerajW
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/master' into Microsoft/ExtensibleInputModule
2 parents 5eb917f + aebe9ee commit dc973d2

19 files changed

+110
-0
lines changed

‎Assets/HoloToolkit-Examples/Text.meta‎

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

‎Assets/HoloToolkit-Examples/Text/3DTextSamples.prefab‎

54.6 KB
Binary file not shown.

‎Assets/HoloToolkit-Examples/Text/3DTextSamples.prefab.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/HoloToolkit-Examples/Text/TextPrefabSamplesTest.unity‎

5.08 KB
Binary file not shown.

‎Assets/HoloToolkit-Examples/Text/TextPrefabSamplesTest.unity.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/HoloToolkit-Examples/Text/UITextSamples.prefab‎

47.5 KB
Binary file not shown.

‎Assets/HoloToolkit-Examples/Text/UITextSamples.prefab.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/HoloToolkit/UI.meta‎

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

‎Assets/HoloToolkit/UI/Materials.meta‎

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

‎Assets/HoloToolkit/UI/Materials/3DTextSegoeUI.mat‎

-1.96 KB
Binary file not shown.

0 commit comments

Comments
 (0)