Merge pull request #2646 from Microsoft/mrtk_development

Mrtk development -> mr dev summit
microsoft · Aug 27, 2018 · a8d9231 · a8d9231
2 parents 9b925c2 + 0d9a785
commit a8d9231
Show file tree

Hide file tree

Showing 49 changed files with 4,212 additions and 1,115 deletions.
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset
@@ -35,7 +35,7 @@ MonoBehaviour:
   touchScreenInputProfile: {fileID: 11400000, guid: efe3718cb67cffa46a5f6361a522baba,
     type: 2}
   enableControllerMapping: 1
-  controllerMappingProfile: {fileID: 11400000, guid: 3b591b9f56584e888f557aa29796cbf8,
+  controllerMappingProfile: {fileID: 11400000, guid: 39ded1fd0711a0c448413d0e1ec4f7f3,
     type: 2}
   enableBoundarySystem: 1
   boundarySystemType: