Marc Audy 608734e30d Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414 ...

#rb
#rnx

[CL 4666113 by Marc Audy in Dev-Framework branch]

2018-12-17 12:24:20 -05:00

..

Configuration

Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414

2018-12-17 12:24:20 -05:00

DotNetCore

Merging //UE4/Release-4.18 @ CL 3709383 to Release-Staging-4.18 (//UE4/Release-Staging-4.18)

2017-10-24 10:14:07 -04:00

Executors

Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414

2018-12-17 12:24:20 -05:00

Platform

Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414

2018-12-17 12:24:20 -05:00

ProjectFiles

Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414

2018-12-17 12:24:20 -05:00

Properties

Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414

2018-12-17 12:24:20 -05:00

System

Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414

2018-12-17 12:24:20 -05:00

ToolChain

Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414

2018-12-17 12:24:20 -05:00

app.config

Undo //UE4/Release-4.21/Engine/... changelist 4420563 (due to builders not having .NET 4.6.2)

2018-10-03 11:50:00 -04:00

UnrealBuildTool.cs

Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414

2018-12-17 12:24:20 -05:00

UnrealBuildTool.csproj

Rework the way that custom icons are used on Windows.

2018-10-08 10:12:20 -04:00