jerome delattre 422b040595 Copy from //Tasks/UE4/Partner-vrCluster ...

nDisplayLauncher - Removed OpenGL3 RHI option from the launcher

#author Andrey.Yamashev
#jira UE-66756
#rb simon.tourangeau

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jerome.delattre
#ROBOMERGE-SOURCE: CL 4947691 in //UE4/Release-4.22/... via CL 4947693
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5069768 by jerome delattre in Dev-Networking branch]

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

..

AppLog

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

Cluster

Copy from //Tasks/UE4/Partner-vrCluster

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

Other

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

Properties

Update copyright notices to 2019.

2018-12-14 13:44:01 -05:00

Settings

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

UIControl

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

ValueConversion

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

App.config

…

App.xaml

…

App.xaml.cs

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

MainWindow.xaml

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

MainWindow.xaml.cs

Resolving conflict from Dev-Enterprise.

2019-01-11 14:26:15 -05:00

nDisplayLauncher.csproj

Resolving conflict.

2019-01-23 16:05:15 -05:00