#rb none
#jira UE-69674
#ROBOMERGE-SOURCE: CL 4974444 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 4974445 by ben marsh in Main branch]
#rb none
#rnx
#jira UE-69366
#ROBOMERGE-SOURCE: CL 4957024 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 4968440 by ben marsh in Main branch]
#rb none
#jira
#rnx
#ROBOMERGE-SOURCE: CL 4957017 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 4968439 by ben marsh in Main branch]
#rb none
#jira
#ROBOMERGE-SOURCE: CL 4957014 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 4968438 by ben marsh in Main branch]
Merge conflict.
daniel.lamb, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE
/src/robomerge_ue4_main_01/Engine/Source/Programs/UnrealBuildTool/System/ConfigFile.cs - merging //Fortnite/Dev-EngineMerge/Engine/Source/Programs/UnrealBuildTool/System/ConfigFile.cs#2
--------------------------------------
Create labels for content builds.
#rb William.Ewen
#ROBOMERGE-SOURCE: CL 4869450 via CL 4873808
[CL 4877426 by daniel lamb in Main branch]
#rb none
#jira UE-69434
#ROBOMERGE-SOURCE: CL 4877079 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 4877081 by ben marsh in Main branch]
The IMPLEMENT_MODULE macro now defines an empty function called IMPLEMENT_MODULE_{ModuleName}, to which we force a reference to via the linker command line. This behavior can be disabled on a per-module basis by setting bRequiresImplementModule = false from a .build.cs file.
#rb none
[CL 4827582 by Ben Marsh in Main branch]
* The icon file is now added as a dependency when compiling resource files.
* The path to the chosen icon file is saved into an "external build metadata" section of the makefile, so that removing or adding the file can cause the makefile to be invalidated on startup.
#rb none
#jira UE-68906
[CL 4812841 by Ben Marsh in Main branch]
