ocornut e285ecca09 Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # backends/imgui_impl_glfw.cpp # backends/imgui_impl_metal.mm # backends/imgui_impl_opengl2.cpp # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_sdlgpu3.cpp # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # imgui.cpp # imgui.h		2025-09-24 14:54:46 +02:00
..
build_mingw.bat	Fixed tabs and spaces (#8377)	2025-02-06 19:54:43 +01:00
build_win32.bat	Examples: Updated all Visual Studio project file to use /utf-8 option, so string literals are UTF-8 encoded by default.	2023-05-10 12:34:11 +02:00
example_win32_opengl3.vcxproj	Revert "Examples: Updated all .vcxproj from VS2015 to VS2019 (toolset v140 to v142), Windows SDK 8.1 to 10."	2025-03-11 18:42:12 +01:00
example_win32_opengl3.vcxproj.filters	Examples: Add Win32/Winapi + OpenGL example. (#3218, #5170 and #6086, #2772, #2600, #2359, #2022, #1553)	2023-04-19 16:22:53 +02:00
main.cpp	Merge branch 'master' into docking	2025-09-24 14:54:46 +02:00