Skip to content

Commit 462e4eb

Browse files
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/master' into RS2_WindowsMixedReality
# Conflicts: # Assets/HoloToolkit/Input/Scripts/InputSources/EditorHandsInput.cs # ProjectSettings/ProjectVersion.txt # README.md
2 parents d218b8a + 672ae97 commit 462e4eb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The HoloToolkit is a collection of scripts and components intended to accelerate
2020
## Please note:
2121
1. We will not merge this branch into master until we have a publicly available Unity that supports it and a HoloLens build that works with these new APIs.
2222
2. You can use this branch with RS2 builds on your PC and deploy it to RS1 HoloLens flight.
23-
3. RS2 flights dont ship on HoloLens.
23+
3. RS2 flights don't ship on HoloLens.
2424

2525
## What's new?
2626
**GamepadInput** supports the Xbox controller and maps it to the input manager events.

0 commit comments

Comments
 (0)