Matthew Griffin 984342ca17 Merging //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) post CL#2804086 to CL#2817167 ...

CL#2805395 resolved as target to avoid copying 2015 changes
#lockdown Nick.Penwarden

[CL 2819197 by Matthew Griffin in Main branch]

2016-01-07 11:21:22 -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

HTML5.Automation.csproj

Summary: running UAT from VS is simpler and faster.

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

HTML5Platform.Automation.cs

Merging //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) post CL#2804086 to CL#2817167

2016-01-07 11:21:22 -05:00

HTML5Platform.PakFiles.Automation.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