From ffb2edbd1627e9eec75f68b4ff00e0861ad84ebe Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@windows.microsoft.com>
Date: Mon, 23 Jul 2018 13:13:18 -0700
Subject: [PATCH] July 2018

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

diff --git a/.nuget/directxmath.nuspec b/.nuget/directxmath.nuspec
index 4c82d3f..fb29e26 100644
--- a/.nuget/directxmath.nuspec
+++ b/.nuget/directxmath.nuspec
@@ -8,7 +8,7 @@
         <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 February 2018 release.</releaseNotes>
+        <releaseNotes>Matches the July 2018 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>
diff --git a/Inc/DirectXMath.h b/Inc/DirectXMath.h
index 13c1302..bd3f4ad 100644
--- a/Inc/DirectXMath.h
+++ b/Inc/DirectXMath.h
@@ -13,7 +13,7 @@
 #error DirectX Math requires C++
 #endif
 
-#define DIRECTX_MATH_VERSION 312
+#define DIRECTX_MATH_VERSION 313
 
 #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 50b9552..e390ea1 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -4,13 +4,13 @@ DirectXMath
 
 Copyright (c) Microsoft Corporation. All rights reserved.
 
-February 2018
+July 2018
 
 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.6 update).
+make use of the latest updates (VS 2015 Update 3 or VS 2017 15.7 update 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>.
@@ -18,7 +18,8 @@ see "Where is the DirectX SDK?" <http://msdn.microsoft.com/en-us/library/ee66327
 Inc\
     DirectXMath Files (in the DirectX C++ namespace)
         DirectXMath.h - Core library
-        DirectXPackedVector.h - Load/Store functions and types for working with various compressed GPU formats
+        DirectXPackedVector.h - Load/Store functions and types for working with various
+                                compressed GPU formats
         DirectXColors.h - .NET-style Color defines in sRGB color space
         DirectXCollision.h - Bounding volume collision library
 
@@ -44,7 +45,7 @@ XDSP\
 All content and source code for this package are subject to the terms of the MIT License.
 <http://opensource.org/licenses/MIT>.
 
-Documentation is available at <https://msdn.microsoft.com/en-us/library/windows/desktop/hh437833.aspx>.
+Documentation is available at <https://docs.microsoft.com/en-us/windows/desktop/dxmath/directxmath-portal>.
 
 For the latest version of DirectXMath, bug reports, etc. please visit the project site.
 <https://github.com/Microsoft/DirectXMath>
@@ -59,6 +60,14 @@ https://opensource.microsoft.com/codeofconduct/
 RELEASE HISTORY
 ---------------
 
+July 2018 (3.13)
+    XMFLOAT3X4, XMFLOAT3X4A, and associated Load/Store functions
+    Move/copy constructors and assignment operators for C++ types
+    Minor fix for XMVectorClamp behavior with NaN
+    Fixed compilation warnings with VS 2017 (15.7 update), Intel C++ 18.0 compiler, and clang 6
+    Retired VS 2013 support
+    Minor code cleanup
+
 February 2018 (3.12)
     ARM64 use of fused multiply-accumulate intriniscs
     Conformance fix for XMConvertFloatToHalf