ocornut a9cd0f5e42 Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_allegro5.cpp # backends/imgui_impl_allegro5.h # backends/imgui_impl_android.cpp # backends/imgui_impl_android.h # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx10.h # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # backends/imgui_impl_dx9.h # backends/imgui_impl_glfw.cpp # backends/imgui_impl_glfw.h # backends/imgui_impl_metal.h # backends/imgui_impl_metal.mm # backends/imgui_impl_opengl2.cpp # backends/imgui_impl_opengl2.h # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_opengl3.h # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl2.h # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_sdl3.h # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_vulkan.h # backends/imgui_impl_win32.cpp # backends/imgui_impl_win32.h # imgui.cpp		2024-12-11 12:27:25 +01: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-12-11 12:27:25 +01:00