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 848d21b6b5 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_sdlrenderer.cpp
#	backends/imgui_impl_sdlrenderer.h
#	imgui.cpp
#	imgui_widgets.cpp
3 years ago
..
vulkan
imgui_impl_allegro5.cpp
imgui_impl_allegro5.h
imgui_impl_android.cpp
imgui_impl_android.h
imgui_impl_dx9.cpp Merge branch 'master' into docking 3 years ago
imgui_impl_dx9.h
imgui_impl_dx10.cpp Merge branch 'master' into docking 3 years ago
imgui_impl_dx10.h
imgui_impl_dx11.cpp Merge branch 'master' into docking 3 years ago
imgui_impl_dx11.h
imgui_impl_dx12.cpp Merge branch 'master' into docking 3 years ago
imgui_impl_dx12.h
imgui_impl_glfw.cpp
imgui_impl_glfw.h
imgui_impl_glut.cpp
imgui_impl_glut.h
imgui_impl_marmalade.cpp
imgui_impl_marmalade.h
imgui_impl_metal.h
imgui_impl_metal.mm Merge branch 'master' into docking 3 years ago
imgui_impl_opengl2.cpp Merge branch 'master' into docking 3 years ago
imgui_impl_opengl2.h
imgui_impl_opengl3.cpp Merge branch 'master' into docking 3 years ago
imgui_impl_opengl3.h
imgui_impl_opengl3_loader.h
imgui_impl_osx.h
imgui_impl_osx.mm
imgui_impl_sdl.cpp
imgui_impl_sdl.h
imgui_impl_sdlrenderer.cpp Merge branch 'master' into docking 3 years ago
imgui_impl_sdlrenderer.h Merge branch 'master' into docking 3 years ago
imgui_impl_vulkan.cpp Merge branch 'master' into docking 3 years ago
imgui_impl_vulkan.h
imgui_impl_wgpu.cpp
imgui_impl_wgpu.h
imgui_impl_win32.cpp
imgui_impl_win32.h