ccarvalheiro e1a182475b PR #6098: Fix editor crash when accepting local revision during merge (Contributed by ccarvalheiro) ...

#rb Dan.OConnor

[CL 9116862 by Dan Oconnor in Dev-Framework branch]

2019-09-25 20:12:08 -04:00

..

BlueprintMergeData.h

Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

2019-01-02 14:54:39 -05:00

Merge.cpp

Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

2019-01-02 14:54:39 -05:00

MergeUtils.cpp

PR #6098: Fix editor crash when accepting local revision during merge (Contributed by ccarvalheiro)

2019-09-25 20:12:08 -04:00

MergeUtils.h

PR #6098: Fix editor crash when accepting local revision during merge (Contributed by ccarvalheiro)

2019-09-25 20:12:08 -04:00

SBlueprintMerge.cpp

PR #6098: Fix editor crash when accepting local revision during merge (Contributed by ccarvalheiro)

2019-09-25 20:12:08 -04:00

SBlueprintMerge.h

Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

2019-01-02 14:54:39 -05:00

SMergeAssetPickerView.cpp

Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

2019-01-02 14:54:39 -05:00

SMergeAssetPickerView.h

Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

2019-01-02 14:54:39 -05:00

SMergeDetailsView.cpp

#jira UE-73228 My Blueprint and Graphs are no longer tabs and are separate top level entries in differ, this is in preparation for showing blueprint variables changes

2019-04-29 20:46:17 -04:00

SMergeDetailsView.h

Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

2019-01-02 14:54:39 -05:00

SMergeGraphView.cpp

#jira UE-73199 Add support for blueprint subclass-specific diffing, by moving the diff results logic into Engine and adding overrides

2019-05-06 21:09:17 -04:00

SMergeGraphView.h

#jira UE-21517 Fix reverse of add/removed pin display on graph diffs, and updated variable names to avoid this in the future as Pin1 was not very descriptive

2019-04-22 14:36:25 -04:00

SMergeTreeView.cpp

#jira UE-73228 My Blueprint and Graphs are no longer tabs and are separate top level entries in differ, this is in preparation for showing blueprint variables changes

2019-04-29 20:46:17 -04:00

SMergeTreeView.h

Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

2019-01-02 14:54:39 -05:00