mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-05 04:10:07 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	misc/debuggers/imgui.natvis
This commit is contained in:
ocornut 2021-03-11 16:31:29 +01:00
commit f1bf642e8f
37 changed files with 586 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj
View file

@ -172,7 +172,7 @@
<ClInclude Include="..\..\backends\imgui_impl_vulkan.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\misc\natvis\imgui.natvis" />
<None Include="..\..\misc\debuggers\imgui.natvis" />
<None Include="..\README.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

4
examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters
View file

@ -51,8 +51,8 @@
</ItemGroup>
<ItemGroup>
<None Include="..\README.txt" />
<None Include="..\..\misc\natvis\imgui.natvis">
<None Include="..\..\misc\debuggers\imgui.natvis">
<Filter>sources</Filter>
</None>
</ItemGroup>
</Project>
</Project>