Dan Oconnor d231f7669a Merge panel's details view can now highlight conflicts ...

[CL 2345194 by Dan Oconnor in Main branch]

2014-10-30 13:36:47 -04:00

..

Private

Merge panel's details view can now highlight conflicts

2014-10-30 13:36:47 -04:00

Public

#UE4 blueprintmerge no longer has buttons, binds to blueprint editor. No longer inherits from SBlueprintDiff.

2014-08-05 14:46:11 -04:00

Merge.Build.cs

Adding PropertiesInOrderDisplayed accessor, Property Highlighting, ShowAllAdvancedProperties, Displayed Properties Changed delegate, Custom Layout disabling, property whitelisting to details view. Used by Diff and Merge tools.

2014-10-23 13:16:13 -04:00