joe conley 09d557b514 #jira UE-78400 ...

#jira UE-78464

Since we are compiling two architectures for HoloLens is causing the second architecture to overwrite the dependency list for the first file. Save them in different locations.

Originally we had a filter to explicitly copy the necessary files, but the filter was too wide. Now that we have this fix, removing the explicit copy filter.

#rb Ben.Marsh

#ROBOMERGE-SOURCE: CL 7846892 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7846932 by joe conley in Main branch]

2019-08-07 18:35:56 -04:00

..

Android

Make sure Android native input box gets hidden when we dismiss the keyboard

2019-08-02 18:51:00 -04:00

BatchFiles

Missed file from 7828884

2019-08-06 21:09:38 -04:00

Graph/Examples

Merging //UE4/Main/Engine/... to //UE4/Dev-Mobile

2019-01-17 21:54:28 -05:00

HTML5

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

2019-05-31 15:38:50 -04:00

IOS

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00

Linux/PGO

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

2019-02-01 00:13:00 -05:00

Mac/RadioEffectUnit

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00

Rsync

include all of Eigen module source when copying to remote server via RSync, because some headers do not have identifiable extensions

2019-06-18 10:02:24 -04:00

SNDBSTemplates

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

2019-05-25 03:15:46 -04:00

TVOS

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

2019-04-04 02:48:32 -04:00

Windows/Resources

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

2019-02-10 00:20:33 -05:00

Build.version

Update version in Main to 4.24.

2019-06-12 12:48:16 -04:00

Commit.gitdeps.xml

Fixing broken system scalability module

2019-08-07 15:27:24 -04:00

InstalledEngineBuild.xml

enable hololens

2019-08-02 16:02:45 -04:00

InstalledEngineFilters.xml

#jira UE-78400

2019-08-07 18:35:56 -04:00

JunkManifest.txt

Merging //UE4/Main/Engine/... to //UE4/Dev-Mobile

2019-01-17 21:54:28 -05:00

PhysXBuild.xml

Copying //UE4/Dev-VR to Main (//UE4/Main)

2019-06-10 12:22:13 -04:00

SourceDistribution.txt

…

Target.cs.template

Merging //UE4/Main/Engine/... to //UE4/Dev-Mobile

2019-01-17 21:54:28 -05:00