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
Jamie Dale
a569f6b356
Fixed code relying on SLATE_TEXT_ATTRIBUTE for STextBlock.
...
UETOOL-213 - Minimize Slate FString -> FText conversion (remove SLATE_TEXT_ATTRIBUTE)
This fixes any editor/engine specific code that was passing text to Slate as FString rather than FText.
[CL 2399803 by Jamie Dale in Main branch]
2015-01-07 09:52:40 -05:00
Ben Marsh
149375b14b
Update copyright notices to 2015.
...
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Jaroslaw Palczynski
ebce413232
UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final.
...
[CL 2104397 by Jaroslaw Palczynski in Main branch]
2014-06-13 06:14:46 -04:00
Mikolaj Sieluzycki
f25a030f9f
Fix for build break caused by CL#2055369.
...
[CL 2055682 by Mikolaj Sieluzycki in Main branch]
2014-04-24 14:34:01 -04:00
Tim Sweeney
324683ce78
Engine source (Main branch up to CL 2026164)
2014-03-14 14:13:41 -04:00