Commit Graph

4 Commits

Author SHA1 Message Date
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Andrew Grant
48b2d10189 Copying from //UE4/Orion-Staging (originated from //Orion/Main @ CL-2766367)
#lockdown Nick.Penwarden

[CL 2770161 by Andrew Grant in Main branch]
2015-11-17 14:50:21 -05:00
Nick Darnell
ac05f885af Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#lockdown Nick.Penwarden

[CL 2754371 by Nick Darnell in Main branch]
2015-11-04 16:14:13 -05:00
Bob Tellez
04d892c6bd [AUTOMERGE]
#UE4 Added the initial revision of the slate null renderer. When using -nullrhi, this renderer is used instead of SlateRHIRenderer.

#rb Matt.Kuhlenschmidt

#codereview Matt.Kuhlenschmidt

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2692587 by Bob.Tellez on 2015/09/15 18:41:09.

[CL 2692588 by Bob Tellez in Main branch]
2015-09-15 18:41:34 -04:00