ocornut ffa863a3ba 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_opengl3.cpp # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp # imgui.cpp		2021-02-18 11:41:27 +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_directx11.vcxproj	Tables: Add empty file, skeleton.	2020-12-04 19:15:19 +01:00
example_win32_directx11.vcxproj.filters	Tables: Add empty file, skeleton.	2020-12-04 19:15:19 +01:00
main.cpp	Merge branch 'master' into docking	2021-02-18 11:41:27 +01:00