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

..

AllDesktop

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

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

Android

#DEV-VR - Manual merge of from DevMain @ CL 4166765

2018-06-28 11:08:34 -04:00

AutomationUtils

Resolving blocked robomerge from Main@4273704

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

BuildGraph

Merging 4214181 to Main

2018-07-16 14:59:05 -04:00

HTML5

Merge to Dev-Main for 4.20 @ 4090813

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

IOS

Merge from //UE4/Main@4203495

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

Linux

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

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

Localization

Merging copyright update from 4.19 branch.

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

Lumin

#DEV-VR - Selective Merge from Dev-Partner-MagicLeap-4.20

2018-07-26 15:36:21 -04:00

Mac

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

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

OneSkyLocalization

Merging copyright update from 4.19 branch.

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

Properties

Merging copyright update from 4.19 branch.

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

Scripts

Resolving blocked robomerge from Main@4273704

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

TVOS

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

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

Win

Merge to Dev-Main for 4.20 @ 4090813

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

XLocLocalization

Resolving blocked robomerge from Main@4273704

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

app.config

Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 4064755)

2018-05-10 14:17:01 -04:00

AutomationTool_Mono.sln

Copying //UE4/Dev-VR to //UE4/Dev-Main (Source: //UE4/Dev-VR @ 4064755)

2018-05-10 14:17:01 -04:00

AutomationTool.csproj

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

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

Program.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