Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4126704

#rb
#rnx

[CL 4127976 by Marc Audy in Dev-Framework branch]
This commit is contained in:
Marc Audy
2018-06-13 15:02:22 -04:00
1773 changed files with 63300 additions and 21995 deletions

View File

@@ -50,6 +50,7 @@ public:
SinglePlatforms.Add(new FAndroid_ATCTargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_DXTTargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_ETC1TargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_ETC1aTargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_ETC2TargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_PVRTCTargetPlatform(bIsClient));