tree 47fab8ee4131ab19ea748560a7f8f89343f8121e
parent da846439881dbbe3697ae42fa129031cb8f467c0
parent 4dab8e69bd46b6aa85a97c4d23e9d894fc5fbcf6
author Brad King <brad.king@kitware.com> 1550586814 -0500
committer Brad King <brad.king@kitware.com> 1550586814 -0500

Merge branch 'vs-win-sdk' into release-3.14

Merge-request: !2989