imports/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-04-02 05:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2023-03-16 12:01:13 +01:00
parent 85beda96de 91577c7f51
commit 6b3435a2db
44 changed files with 127 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/example_win32_directx12/example_win32_directx12.vcxproj
View File

@@ -164,6 +164,7 @@
<ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\misc\debuggers\imgui.natstepfilter" />
<None Include="..\README.txt" />
</ItemGroup>
<ItemGroup>

3
examples/example_win32_directx12/example_win32_directx12.vcxproj.filters
View File

@@ -53,6 +53,9 @@
</ItemGroup>
<ItemGroup>
<None Include="..\README.txt" />
<None Include="..\..\misc\debuggers\imgui.natstepfilter">
<Filter>imgui</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Natvis Include="..\..\misc\debuggers\imgui.natvis">