Commit Graph

7 Commits

Author SHA1 Message Date
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05: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
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
Jeffrey Soldan
2a2f1b5d39 Sequencer: SubSequence and Shot tracks show source frame indicator
#jira UE-74687
#rb andrew.rodham

[CL 6666865 by Jeffrey Soldan in Dev-Sequencer branch]
2019-05-29 15:56:46 -04:00
Andrew Grant
9d58a141e9 Copying //UE4/Orion-Staging to Dev-Main (Originates from //Orion/Main @ CL-2759376)
#lockdown Nick.Penwarden

[CL 2759916 by Andrew Grant in Main branch]
2015-11-09 19:35:15 -05:00
Nick Penwarden
4ccf8be305 Mergine engine changes to //UE4/Main @ 2748007
[CL 2748770 by Nick Penwarden in Main branch]
2015-10-30 17:41:13 -04:00