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
..
vulkan Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft) 4 years ago
imgui_impl_allegro5.cpp Backends: Cleanup, removed unnecessary create/destroy wrappers. Fix allegro5 backend + use same code as other backend. 4 years ago
imgui_impl_allegro5.h Backends: Comments. 4 years ago
imgui_impl_android.cpp ImFontAtlas: move implicit AddFontDefault call to Build() function + remove unnecessary asserts in backend. 4 years ago
imgui_impl_android.h Backends: Comments. 4 years ago
imgui_impl_dx9.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_dx9.h Merge branch 'master' into docking 4 years ago
imgui_impl_dx10.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_dx10.h Merge branch 'master' into docking 4 years ago
imgui_impl_dx11.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_dx11.h Merge branch 'master' into docking 4 years ago
imgui_impl_dx12.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_dx12.h Merge branch 'master' into docking 4 years ago
imgui_impl_glfw.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_glfw.h Backends: GLFW: Installing and exposed ImGui_ImplGlfw_MonitorCallback() for forward compatibility with docking branch. 4 years ago
imgui_impl_glut.cpp Backends: Comments. 4 years ago
imgui_impl_glut.h Backends: Comments. 4 years ago
imgui_impl_marmalade.cpp Backends: Comments. 4 years ago
imgui_impl_marmalade.h Backends: Comments. 4 years ago
imgui_impl_metal.h Merge branch 'master' into docking 4 years ago
imgui_impl_metal.mm Merge branch 'master' into docking 4 years ago
imgui_impl_opengl2.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_opengl2.h Merge branch 'master' into docking 4 years ago
imgui_impl_opengl3.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_opengl3.h Merge branch 'master' into docking 4 years ago
imgui_impl_osx.h Merge branch 'master' into docking 4 years ago
imgui_impl_osx.mm Merge branch 'master' into docking 4 years ago
imgui_impl_sdl.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_sdl.h Merge branch 'master' into docking 4 years ago
imgui_impl_vulkan.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_vulkan.h Backends: Viewports: renamed viewport storage structures ImGuiViewportDataXXXX -> ImGui_ImplXXXX_ViewportData and locals (matching naming convention in 70c60385) 4 years ago
imgui_impl_wgpu.cpp Backends: Comments. 4 years ago
imgui_impl_wgpu.h Backends: Comments. 4 years ago
imgui_impl_win32.cpp Merge branch 'master' into docking 4 years ago
imgui_impl_win32.h Merge branch 'master' into docking 4 years ago