3 Commits

Author	SHA1	Message	Date
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	b26a182a0d	Adding PropertiesInOrderDisplayed accessor, Property Highlighting, ShowAllAdvancedProperties, Displayed Properties Changed delegate, Custom Layout disabling, property whitelisting to details view. Used by Diff and Merge tools. ... Merge tool highlighting improved, now uses property paths. [CL 2338733 by Dan Oconnor in Main branch]	2014-10-23 13:16:13 -04:00
Dan Oconnor	79165ed057	#UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge ... [CL 2116875 by Dan Oconnor in Main branch]	2014-06-25 13:25:21 -04:00