Skip to content

Commit ed1501a

Browse files
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/master'
2 parents cf60cf3 + 4aef45b commit ed1501a

File tree

99 files changed

+4653
-774
lines changed

Some content is hidden

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

99 files changed

+4653
-774
lines changed

Assets/HoloToolkit-Examples/ColorPicker/Example.unity renamed to Assets/HoloToolkit-Examples/ColorPicker/ColorPickerExample.unity

File renamed without changes.

Assets/HoloToolkit-Examples/ColorPicker/Example.unity.meta renamed to Assets/HoloToolkit-Examples/ColorPicker/ColorPickerExample.unity.meta

File renamed without changes.

Assets/HoloToolkit-Examples/GameControllerManipulator.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.

0 commit comments

Comments
 (0)