Dan Oconnor 5f4d2fe1c8 Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference ...

[CL 2349504 by Dan Oconnor in Main branch]

2014-11-04 22:25:35 -05:00

..

Private

Conflict detection and diff highlighting fixed for the tree view. Also fixed Native Components not being checked. And an off by one error in HasNextDifference

2014-11-04 22:25:35 -05: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