Mike Beach 1110c6a4d9 Resolving blocked robomerge from Main@4273704 ...

Accpted source for conflicted files:
.../Portal/Plugins/Online/NotForLicensees/OnlineSubsystemMcp/Source/Private/OnlineFriendsMcp.cpp
.../Portal/Source/Layers/UI/Private/SocialPresentation.cpp

#rb no.one
#fyi Jason.Bestimt

[CL 4279626 by Mike Beach in Dev-VR branch]

2018-08-13 11:49:16 -04:00

..

Properties

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

Automation.cs

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3847469)

2018-01-20 11:19:29 -05:00

AutomationException.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

AutomationUtils.Automation.csproj

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -04:00

BuildCommand.cs

Copying //UE4/Fortnite-Staging to //UE4/Dev-Main (Source: //Fortnite/Main/Engine @ 3876564)

2018-02-22 11:25:06 -05:00

BuildUtils.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

CommandEnvironment.cs

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -04:00

CommandletUtils.cs

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -04:00

CommandUtils.cs

Copying //UE4/Release-Staging-4.19 to //UE4/Dev-Main (Source: //UE4/Release-4.19 @ 3873914)

2018-02-27 17:30:35 -05:00

DeploymentContext.cs

Merging CL# 4243662

2018-07-31 17:08:40 -04:00

DeviceReservation.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

Distiller.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

HelpUtils.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

HostPlatform.cs

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3847469)

2018-01-20 11:19:29 -05:00

ImageUtils.cs

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -04:00

LinuxHostPlatform.cs

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3847469)

2018-01-20 11:19:29 -05:00

LogUtils.cs

Merging Gauntlet changes for 4.20 from //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)

2018-04-28 16:21:36 -04:00

MacHostPlatform.cs

Merging Gauntlet changes for 4.20 from //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)

2018-04-28 16:21:36 -04:00

MCPPublic.cs

Resolving blocked robomerge from Main@4273704

2018-08-13 11:49:16 -04:00

P4Blame.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

P4Environment.cs

Merge from //UE4/Main@4203495

2018-07-12 19:05:28 -04:00

P4Utils.cs

Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)

2018-02-20 15:08:07 -05:00

ParallelExecutor.cs

Merge from //UE4/Main@4203495

2018-07-12 19:05:28 -04:00

Platform.cs

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -04:00

ProcessUtils.cs

Copying //UE4/PQ-Staging@3957047 to Dev-Main (//UE4/Dev-Main)

2018-03-21 11:09:41 -04:00

ProjectParams.cs

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -04:00

ProjectUtils.cs

Merge from //UE4/Main@4203495

2018-07-12 19:05:28 -04:00

ReadAllText.tps

Stripping out inaccurate/easily misconstrued .tps info in preparation for exposing this to licensees

2016-10-07 00:40:14 -04:00

ScriptCompiler.cs

Merging Gauntlet changes for 4.20 from //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)

2018-04-28 16:21:36 -04:00

SharedUtils.cs

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3847469)

2018-01-20 11:19:29 -05:00

StagedDirectoryReference.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

StagedFileReference.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

StagedFileSystemReference.cs

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 4034418)

2018-04-26 14:11:04 -04:00

ThreadPoolWorkQueue.cs

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

UBTUtils.cs

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3847469)

2018-01-20 11:19:29 -05:00

UE4Build.cs

Merge from //UE4/Main@4203495

2018-07-12 19:05:28 -04:00

Utils.cs

Merging Gauntlet changes for 4.20 from //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)

2018-04-28 16:21:36 -04:00

WindowsHostPlatform.cs

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 3847469)

2018-01-20 11:19:29 -05:00