ocornut a11f36811f 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_opengl3.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h		2021-07-09 20:16:19 +02:00
..
build_win32.bat	Added build/ to gitignore (#3027), Examples: SDL2: Link with shell32.lib required by SDL2main.lib since SDL 2.0.12. [#3988, #3884] + added batch file for SDL+Vulkan.	2021-03-31 16:19:44 +02:00
example_sdl_directx11.vcxproj	Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments.	2021-06-08 17:10:24 +02: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-07-09 20:16:19 +02:00