Matthew Griffin bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update ...

#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]

2016-01-07 08:17:16 -05:00

..

AllDesktop

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

Android

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

AutomationUtils

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

GUBP

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

HTML5

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

IOS

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

Linux

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

Mac

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

Properties

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

Scripts

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

TVOS

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

Win

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

app.config

Summary: running UAT from VS is simpler and faster.

2015-07-09 10:15:37 -04:00

AutomationTool_Mono.sln

Copying //UE4/Dev-Platform to //UE4/Main

2015-12-10 16:56:55 -05:00

AutomationTool.csproj

Fix for 'launch on' not working due to stale code from other projects preventing UAT from compiling. Editor passes -ScriptsForProject= argument to UAT to limit the scripts which are compiled and loaded, but a stale AutomationTool.csproj.References file can bring in references to other projects. Disable the include using a property passed on the command line from RunUAT.bat.

2015-11-17 11:55:31 -05:00

Program.cs

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

SharedUtils.cs

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00