Skip to content

Commit a8d9231

Browse files
author
David Kline
authored
Merge pull request #2646 from Microsoft/mrtk_development
Mrtk development -> mr dev summit
2 parents 9b925c2 + 0d9a785 commit a8d9231

File tree

49 files changed

+4212
-1115
lines changed

Some content is hidden

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

49 files changed

+4212
-1115
lines changed

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ MonoBehaviour:
3535
touchScreenInputProfile: {fileID: 11400000, guid: efe3718cb67cffa46a5f6361a522baba,
3636
type: 2}
3737
enableControllerMapping: 1
38-
controllerMappingProfile: {fileID: 11400000, guid: 3b591b9f56584e888f557aa29796cbf8,
38+
controllerMappingProfile: {fileID: 11400000, guid: 39ded1fd0711a0c448413d0e1ec4f7f3,
3939
type: 2}
4040
enableBoundarySystem: 1
4141
boundarySystemType:

0 commit comments

Comments
 (0)