You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 years ago
..
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.	4 years ago
example_sdl_directx11.vcxproj	Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments.	4 years ago
example_sdl_directx11.vcxproj.filters	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	4 years ago
main.cpp	Merge branch 'master' into docking	4 years ago