ryan gerleve b41214417e Resolving conflict from Dev-Enterprise. ...

/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp - merging //UE4/Main/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp#20


--------------------------------------
Copying //UE4/Dev-Enterprise[at]4705006 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: francis.hurteau
#ROBOMERGE-SOURCE: CL 4705151 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712032 by ryan gerleve in Dev-Networking branch]

2019-01-11 14:26:15 -05:00

..

BuildPatchTool/Config

Merging \\UE4\Portal-Staging to \\UE4\Main

2016-06-29 18:00:01 -04:00

CrashReportClient/Config

Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)

2018-06-07 22:39:07 -04:00

ShaderCompileWorker/Config

Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)

2018-06-07 22:39:07 -04:00

UnrealFrontend/Config

Copying //UE4/Dev-Mobile to //UE4/Dev-Main (Source: //UE4/Dev-Mobile @ 3056055)

2016-07-19 19:13:01 -04:00

UnrealGameSync

Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)

2018-09-04 14:32:41 -04:00

UnrealHeaderTool/Config

Copying //UE4/Dev-Framework to //UE4/Dev-Main (Source: //UE4/Dev-Framework @ 3582324)

2017-08-11 12:43:42 -04:00

UnrealLightmass/Config

…

UnrealMultiUserServer/Config

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00