You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
a72aa3c306
Merge conflict. justin.marcus, please merge this change by hand. More info at https://robomerge.epicgames.net#FORTNITE /src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp#3 /src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp#4 /src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h#3 -------------------------------------- Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main) Get Install Bundle Manager and dependcies building in main. #rb none #ROBOMERGE-OWNER: ryan.gerleve #ROBOMERGE-AUTHOR: justin.marcus #ROBOMERGE-SOURCE: CL 4949345 via CL 4952070 via CL 4961624 #ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking) [CL 5073469 by justin marcus in Dev-Networking branch]