Commit Graph

7 Commits

Author SHA1 Message Date
Brandon Schaefer
9bc8cb80ac Forgot to submit change here for zlib when building toolchain
#jira none
#rb none

[CL 19542143 by Brandon Schaefer in ue5-main branch]
2022-03-29 10:50:34 -04:00
aurel cordonnier
dc856801cd Merge from Release-Engine-Test @ 17059716 to UE5/Main
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17029914

[CL 17060422 by aurel cordonnier in ue5-main branch]
2021-08-04 17:46:20 -04:00
Michael Sartain
67e0e07e7e Convert CRLF Linux files to LF
They need to be LF on Linux like all the other bat files, and
git really doesn't like .bat files with mixed line endings since our .gitattributes file claims all .bat files are CRLF.

PR #8241

#rb Brandon.Schaefer
#fyi Ben.Marsh
#jira none

[CL 16971649 by Michael Sartain in ue5-main branch]
2021-07-27 14:57:32 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Rolando Caloca
f83ae4807a Copying //UE4/Dev-Rendering@9317594 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9317904 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-01 13:03:04 -04:00