jamie dale 25e852a5e8 Fixed localization conflicts ...

#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11448060 in //UE4/Release-4.25/... via CL 11448075
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11448100 by jamie dale in Main branch]

2020-02-14 15:49:24 -05:00

..

Private

Fixed localization conflicts

2020-02-14 15:49:24 -05:00

Public

Add option on whether to prompt user with checkout dialog in AssetFixUpRedirectors and use it to avoid pop-up in PPID generation.

2020-02-14 15:01:22 -05:00

AssetTools.Build.cs

Updating copyright for Engine Developer.

2019-12-26 15:32:37 -05:00