josh adams 8ba99b94de - Proper fix to merge conflicts ...

#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032626 by josh adams in Dev-VR branch]

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

..

Binaries

Quote $UE_MONO_DIR in Mono's mcs script to make it work correctly when the engine is installed in a folder containing space characters in its path

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

Build

Saving Composure plugin asset to resolve empty engine version warning.

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

Config

- Memory Mapped IO enabled on IOS for Audio (via ini and platform property)

2019-02-16 06:02:18 -05:00

Documentation

Markdown conversion for UE release 4.20.

2019-02-03 12:14:31 -05:00

Extras

HTML5 - remove old emscripten toolchain (1.38.20)

2019-02-04 15:12:13 -05:00

Plugins

#jira UE-69749 - Level deleted upon leaving a multi-users session.

2019-02-16 07:11:06 -05:00

Programs

…

Shaders

Integrating github change to optimize shadow occlusion evaluation.

2019-02-16 06:00:53 -05:00

Source

- Proper fix to merge conflicts

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