Saul Abreu d18f6fccc4 Added mising #undef LOCTEXT_NAMESPACE in SMergeGraphView.cpp ...

[CL 2289790 by Saul Abreu in Main branch]

2014-09-08 15:22:04 -04:00

..

BlueprintMergeData.h

#UE4 CDO view reintroduced to merge tool, replaced set of strings with set of fnames

2014-08-15 17:19:11 -04:00

Merge.cpp

Backing out my last change... it results in the merge tool not staying open when tabs are switched. This restores the previous bug: the merge tool is initially floating

2014-09-01 22:02:31 -04:00

MergePrivatePCH.h

#UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge

2014-06-25 13:25:21 -04:00

SBlueprintMerge.cpp

Abusing a global, moved to member function. This triggered an assert on Linux, may also not play nice with monolithic builds that include the merge module...

2014-09-02 16:17:21 -04:00

SBlueprintMerge.h

Abusing a global, moved to member function. This triggered an assert on Linux, may also not play nice with monolithic builds that include the merge module...

2014-09-02 16:17:21 -04:00

SMergeDetailsView.cpp

#UE4 diff control can now enumerate differences in SCS, same for merge control. No longer looping around the end of the differences list

2014-08-28 10:03:31 -04:00

SMergeDetailsView.h

#UE4 diff control can now enumerate differences in SCS, same for merge control. No longer looping around the end of the differences list

2014-08-28 10:03:31 -04:00

SMergeGraphView.cpp

Added mising #undef LOCTEXT_NAMESPACE in SMergeGraphView.cpp

2014-09-08 15:22:04 -04:00

SMergeGraphView.h

#UE4 diff control can now enumerate differences in SCS, same for merge control. No longer looping around the end of the differences list

2014-08-28 10:03:31 -04:00

SMergeTreeView.cpp

Merge view for components no longer lists the same difference multiple times

2014-08-28 10:43:40 -04:00

SMergeTreeView.h

#UE4 diff control can now enumerate differences in SCS, same for merge control. No longer looping around the end of the differences list

2014-08-28 10:03:31 -04:00