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

..

Private

Resolving blocked robomerge from Main@4273704

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

Public

Merging copyright update from 4.19 branch.

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

SlateReflector.Build.cs

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

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