Commit Graph

5 Commits

Author SHA1 Message Date
bertrand carre
a24b96f42f Replace/remove uses of whitelist/blacklist in WebSockets
#jira UE-131111
#rb Alexandro.Aguilar, Steven.Bedford
#preflight 6203cd410927956f66b644c1

#ROBOMERGE-AUTHOR: bertrand.carre
#ROBOMERGE-SOURCE: CL 18920307 in //UE5/Release-5.0/... via CL 18926836 via CL 18928305
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v916-18915374)

[CL 18928642 by bertrand carre in ue5-main branch]
2022-02-09 19:06:29 -05:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00