6 Commits

Author	SHA1	Message	Date
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
Dan Oconnor	794d5ebbd8	Creating tree view for displaying changes in the blueprint diff tool, will be extended to merge tool presently... ... [CL 2375293 by Dan Oconnor in Main branch]	2014-12-03 17:10:49 -05:00
Dan Oconnor	9786c96390	Conflict highlighting for the graph view in the merge tool ... [CL 2341736 by Dan Oconnor in Main branch]	2014-10-27 19:34:03 -04:00
TimSweeney	3a75fe0114	Engine source (Main branch up to CL 2027006)	2014-03-15 01:14:25 -04:00
Tim Sweeney	324683ce78	Engine source (Main branch up to CL 2026164)	2014-03-14 14:13:41 -04:00