ocornut 5386ddcd05 Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl.cpp # examples/example_emscripten_opengl3/main.cpp # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_glut_opengl2/main.cpp # examples/example_sdl_directx11/main.cpp # examples/example_sdl_opengl2/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp # imgui_demo.cpp		2023-02-02 18:31:26 +01:00
..
build_win32.bat	Examples: Fix batch files (amend b1a18d82, #3513), standardize them + DirectX12: Move ImGui::Render() call above the first barrier to clarify its lack of effect on the graphics pipe.	2020-12-09 18:28:02 +01:00
example_win32_directx12.vcxproj	Examples: updated VS projects with .natvis file under imgui/	2022-09-14 14:17:47 +02:00
example_win32_directx12.vcxproj.filters	Examples: updated VS projects with .natvis file under imgui/	2022-09-14 14:17:47 +02:00
main.cpp	Merge branch 'master' into docking	2023-02-02 18:31:26 +01:00