Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769

autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
This commit is contained in:
Marcus Wassmer
2020-09-24 00:43:27 -04:00
parent 6638f126f7
commit 3b81cf8201
13529 changed files with 2378633 additions and 444266 deletions
@@ -1,19 +1,19 @@
{
"FileVersion" : 3,
"Version" : 1,
"VersionName" : "1.0",
"FriendlyName" : "Microsoft Windows Mixed Reality",
"Description" : "Support for Microsoft Windows Mixed Reality compatible devices.",
"Category" : "Virtual Reality",
"CreatedBy" : "Microsoft Corporation",
"CreatedByURL" : "http://www.microsoft.com",
"DocsURL" : "",
"MarketplaceURL" : "",
"SupportURL" : "",
"EnabledByDefault" : false,
"CanContainContent" : false,
"IsBetaVersion" : false,
"Installed" : false,
"FileVersion": 3,
"Version": 1,
"VersionName": "1.0",
"FriendlyName": "Microsoft Windows Mixed Reality",
"Description": "Support for Microsoft Windows Mixed Reality compatible devices.",
"Category": "Virtual Reality",
"CreatedBy": "Microsoft Corporation",
"CreatedByURL": "http://www.microsoft.com",
"DocsURL": "",
"MarketplaceURL": "",
"SupportURL": "",
"EnabledByDefault": false,
"CanContainContent": true,
"IsBetaVersion": false,
"Installed": false,
"SupportedTargetPlatforms": [
"Win64",
"HoloLens"
@@ -88,6 +88,15 @@
"WhitelistPlatforms": [
"Win64"
]
},
{
"Name": "HoloLensAR",
"Type": "Runtime",
"LoadingPhase": "PostConfigInit",
"WhitelistPlatforms": [
"HoloLens",
"Win64"
]
}
],
"Plugins": [
@@ -98,14 +107,6 @@
{
"Name": "LiveLink",
"Enabled": true
},
{
"Name": "HoloLensAR",
"Enabled": true,
"WhitelistPlatforms": [
"Win64",
"HoloLens"
]
}
]
}