ben marsh
|
82f2080de3
|
Copy UGS from Dev-Build (pt 2)
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4732764 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4733960 by ben marsh in Dev-Networking branch]
|
2019-01-16 13:39:33 -05:00 |
|
ryan gerleve
|
cac17e709a
|
Fixing merge conflict.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Programs/UnrealGameSync/UnrealGameSync/Forms/PerforceSyncSettingsWindow.cs - merging //UE4/Main/Engine/Source/Programs/UnrealGameSync/UnrealGameSync/Forms/PerforceSyncSettingsWindow.cs#1
--------------------------------------
Copying latest UGS from Dev-Build (pt 1)
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4732753 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4733949 by ryan gerleve in Dev-Networking branch]
|
2019-01-16 13:38:33 -05:00 |
|
ben marsh
|
2b46ba7b94
|
Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4662404 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 4662413 by ben marsh in Dev-Networking branch]
|
2018-12-14 13:44:01 -05:00 |
|
Ryan Gerleve
|
58b2ff476e
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
[CL 4227549 by Ryan Gerleve in Dev-Networking branch]
|
2018-07-23 14:41:30 -04:00 |
|
Ryan Gerleve
|
ac280888a0
|
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx
[CL 4175728 by Ryan Gerleve in Dev-Networking branch]
|
2018-06-29 20:48:58 -04:00 |
|