mitchell wilson 659569aede Saving Composure plugin asset to resolve empty engine version warning. ...

#jira UE-69943
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mitchell.wilson
#ROBOMERGE-SOURCE: CL 4974367 in //UE4/Release-4.22/... via CL 4974372
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032624 by mitchell wilson in Dev-VR branch]

2019-02-16 07:13:41 -05:00

..

Android

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

2019-01-25 23:58:19 -05:00

BatchFiles

Linux: download to the v13 toolchain for 4.22 (UE-69672)

2019-02-16 06:01:52 -05:00

Graph/Examples

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

2019-01-17 18:54:05 -05:00

HTML5

HTML5 - fix log spam

2019-02-04 15:01:19 -05:00

IOS

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

2019-01-17 18:54:05 -05:00

Linux/PGO

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

2019-01-29 17:41:46 -05:00

Mac/RadioEffectUnit

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

2019-01-17 18:54:05 -05:00

Rsync

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

2019-01-17 18:54:05 -05:00

TVOS

Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main)

2018-10-24 11:55:58 -04:00

Windows/Resources

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

2019-02-06 13:27:58 -05:00

Build.version

Update version in Main to 4.23.

2019-01-31 21:26:12 -05:00

Commit.gitdeps.xml

Saving Composure plugin asset to resolve empty engine version warning.

2019-02-16 07:13:41 -05:00

InstalledEngineBuild.xml

Add the -createstub argument when compiling installed target platform files for TVOS.

2019-02-16 02:37:24 -05:00

InstalledEngineFilters.xml

Add XcodeBuild.sh to filters for installed build.

2019-02-16 03:35:19 -05:00

JunkManifest.txt

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

2019-01-17 18:54:05 -05:00

PhysXBuild.xml

Merge to Dev-Main for 4.20 @ 4090813

2018-05-23 21:04:31 -04:00

SourceDistribution.txt

…

Target.cs.template

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

2019-01-17 18:54:05 -05:00