Merge branch 'master' into context

This commit is contained in:
omar
2018-01-24 19:31:11 +01:00
17 changed files with 178 additions and 98 deletions

View File

@ -153,6 +153,7 @@
<ClInclude Include="imgui_impl_dx9.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\libs\imgui.natvis" />
<None Include="..\README.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View File

@ -42,5 +42,8 @@
</ItemGroup>
<ItemGroup>
<None Include="..\README.txt" />
<None Include="..\libs\imgui.natvis">
<Filter>sources</Filter>
</None>
</ItemGroup>
</Project>