ocornut 514a97a9b7 Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx11.h # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx12.h # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdlrenderer2.cpp # backends/imgui_impl_sdlrenderer2.h # backends/imgui_impl_sdlrenderer3.cpp # backends/imgui_impl_sdlrenderer3.h # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_vulkan.h # backends/imgui_impl_wgpu.cpp # backends/imgui_impl_wgpu.h # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_demo.cpp		2024-10-14 19:23:23 +02:00
..
build_win32.bat	(Breaking) Default ImTextureID to use a Im64 instead of void* (#1641)	2024-10-08 14:21:44 +02:00
example_win32_directx12.vcxproj	(Breaking) Default ImTextureID to use a Im64 instead of void* (#1641)	2024-10-08 14:21:44 +02:00
example_win32_directx12.vcxproj.filters	Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. (#3038)	2023-03-15 17:09:09 +01:00
main.cpp	Merge branch 'master' into docking	2024-10-14 19:23:23 +02:00