Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)

#rb none

[CL 4577636 by Ben Marsh in Dev-Build branch]
This commit is contained in:
Ben Marsh
2018-11-19 10:12:17 -05:00
parent 9f1b2261a8
commit b0da1f4fe7
1699 changed files with 69042 additions and 23007 deletions
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -11,6 +11,7 @@
<AssemblyName>TVOS.Automation</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<WarningsNotAsErrors>612,618</WarningsNotAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>