ben zeigler b315507aff #jira UE-60794 Fix it so Accept Target in merge tool does not crash the editor. The ReloadBlueprint call was nulling out references so we need to close any active editors before doing it ...

I am not sure that the merge will work, but at least it won't crash
#rb dan.oconnor

#ROBOMERGE-SOURCE: CL 4148195 in //UE4/Release-4.20/...
#ROBOMERGE-BOT: RELEASE (Release-4.20 -> Release-Staging-4.20)
#ROBOMERGE-AUTHOR: ben.zeigler

[CL 4150451 by ben zeigler in Staging-4.20 branch]

2018-06-20 14:27:24 -04:00

..

Private

#jira UE-60794 Fix it so Accept Target in merge tool does not crash the editor. The ReloadBlueprint call was nulling out references so we need to close any active editors before doing it

2018-06-20 14:27:24 -04:00

Public

Merging copyright update from 4.19 branch.

2018-01-02 15:30:26 -05:00

Merge.Build.cs

Copying //UE4/Dev-Core to //UE4/Dev-Main (Source: //UE4/Dev-Core @ 4034418)

2018-04-26 14:11:04 -04:00