Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-07 21:39:54 +02:00
Code Issues Packages Projects Releases Wiki 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
parent 4b9bc49020 fdc2324d9a
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_opengl3/example_sdl_opengl3.vcxproj
View File

@ -175,7 +175,7 @@
<ClInclude Include="..\libs\gl3w\GL\glcorearb.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" />

2
examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters
View File

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