Merge 'ocornut/master' into 'jdmo3/master'

This commit is contained in:
Jefferson Montgomery
2017-09-24 14:22:25 -07:00
committed by Jefferson Montgomery
47 changed files with 4259 additions and 2296 deletions

View File

@ -161,4 +161,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>