From 5dd7751dc5ea7a0e80b297a6f723567b2106090a Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@windows.microsoft.com>
Date: Mon, 22 Jul 2019 14:10:24 -0700
Subject: [PATCH] July 2019

---
 .nuget/directxmath.nuspec |  6 +++---
 Inc/DirectXMath.h         |  2 +-
 ReadMe.txt                | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.nuget/directxmath.nuspec b/.nuget/directxmath.nuspec
index fb29e26..070914d 100644
--- a/.nuget/directxmath.nuspec
+++ b/.nuget/directxmath.nuspec
@@ -7,11 +7,11 @@
         <authors>Microsoft</authors>
         <owners>microsoft,directxtk</owners>
         <summary>DirectXMath is an all inline SIMD C++ linear algebra library for use in games and graphics apps.</summary>
-        <description>The DirectXMath API provides SIMD-friendly C++ types and functions for common linear algebra and graphics math operations common to DirectX applications. The library provides optimized versions for Windows 32-bit (x86), Windows 64-bit (x64), and Windows RT through SSE2 and ARM-NEON intrinsics support in the Visual Studio compiler.</description>
-        <releaseNotes>Matches the July 2018 release.</releaseNotes>
+        <description>The DirectXMath API provides SIMD-friendly C++ types and functions for common linear algebra and graphics math operations common to DirectX applications. The library provides optimized versions for Windows 32-bit (x86), Windows 64-bit (x64), and Windows on ARM through SSE2 and ARM-NEON intrinsics support in the Visual Studio compiler.</description>
+        <releaseNotes>Matches the July 2019 release.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkID=615560</projectUrl>
         <iconUrl>https://github.com/Microsoft/DirectXMath/wiki/X_jpg.jpg</iconUrl>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+        <license type="expression">MIT</license>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
         <tags>C++  native  DirectX  math nativepackage</tags>
diff --git a/Inc/DirectXMath.h b/Inc/DirectXMath.h
index 9ffb0f3..67ed509 100644
--- a/Inc/DirectXMath.h
+++ b/Inc/DirectXMath.h
@@ -13,7 +13,7 @@
 #error DirectX Math requires C++
 #endif
 
-#define DIRECTX_MATH_VERSION 313
+#define DIRECTX_MATH_VERSION 314
 
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
 #error DirectX Math requires Visual C++ 2015 or later.
diff --git a/ReadMe.txt b/ReadMe.txt
index e390ea1..243eef4 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -4,13 +4,14 @@ DirectXMath
 
 Copyright (c) Microsoft Corporation. All rights reserved.
 
-July 2018
+July 2019
 
 This package contains the DirectXMath library, an all inline SIMD C++ linear algebra library
 for use in games and graphics apps
 
-This code is designed to build with Visual Studio 2015 or 2017. It is recommended that you
-make use of the latest updates (VS 2015 Update 3 or VS 2017 15.7 update or later).
+This code is designed to build with Visual Studio 2015, 2017, or 2019. It is recommended
+that you make use of the latest updates (VS 2015 Update 3, VS 2017 15.9 update, or
+VS 2019 Update 1 or later).
 
 These components are designed to work without requiring any content from the DirectX SDK. For details,
 see "Where is the DirectX SDK?" <http://msdn.microsoft.com/en-us/library/ee663275.aspx>.
@@ -60,6 +61,14 @@ https://opensource.microsoft.com/codeofconduct/
 RELEASE HISTORY
 ---------------
 
+July 2019 (3.14)
+    Added float control around IsNan functions to resolve issue with VS 2019 with /fp:fast
+    XMVerifyCPUSupport updated for clang/LLVM cpuid implementation on x86/x64
+    Added support for clang/LLVM built-in platform defines as well as the MSVC ones
+    Cleaned up ARM-NEON intrinsics type issues for improved portability
+    Removed unneeded malloc.h include in DirectXMath.h
+    Whitespace cleanup
+
 July 2018 (3.13)
     XMFLOAT3X4, XMFLOAT3X4A, and associated Load/Store functions
     Move/copy constructors and assignment operators for C++ types