ocornut e7577d570e Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_dx9.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h # imgui_widgets.cpp		2021-03-25 16:57:01 +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_sdl_directx11.vcxproj	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	2021-03-11 16:21:46 +01:00
example_sdl_directx11.vcxproj.filters	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	2021-03-11 16:21:46 +01:00
main.cpp	Merge branch 'master' into docking	2021-03-25 16:57:01 +01:00