Commit Graph

3 Commits

Author SHA1 Message Date
justin marcus
8b39bd15b0 Move Install Bundle Manager interface out of core and into the bundle manager module.
[at]Thomas.Ross [at]Daniel.Lamb


#ROBOMERGE-SOURCE: CL 7842003 via CL 7842009 via CL 7842010 via CL 7860819
#ROBOMERGE-BOT: (v389-7813075)

[CL 7860867 by justin marcus in Main branch]
2019-08-08 00:48:21 -04:00
Justin Marcus
3421b059f4 Update coopyright notices
#jira UE-69926
#rb trivial

[CL 4970841 by Justin Marcus in Main branch]
2019-02-12 10:52:20 -05:00
justin marcus
8c97e3c469 #CodeReview: justin.marcus,jeff.williams
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.



#ROBOMERGE-SOURCE: CL 4949345 via CL 4952070

#rb none

[CL 4961624 by justin marcus in Main branch]
2019-02-11 09:22:06 -05:00