1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-16 17:46:00 +01:00
imgui/backends
ocornut 042a3b01d2 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	examples/README.txt
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_directx11/main.cpp
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
2020-10-14 14:44:03 +02:00
..
vulkan Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft) 2020-10-14 14:41:40 +02:00
imgui_impl_allegro5.cpp Moving backends code from examples/ to backends/ (step 6: update markdown documentation) 2020-10-14 14:42:00 +02:00
imgui_impl_allegro5.h Moving backends code from examples/ to backends/ (step 6: update markdown documentation) 2020-10-14 14:42:00 +02:00
imgui_impl_dx9.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_dx9.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_dx10.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_dx10.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_dx11.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_dx11.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_dx12.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_dx12.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_glfw.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_glfw.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_glut.cpp Moving backends code from examples/ to backends/ (step 6: update markdown documentation) 2020-10-14 14:42:00 +02:00
imgui_impl_glut.h Moving backends code from examples/ to backends/ (step 6: update markdown documentation) 2020-10-14 14:42:00 +02:00
imgui_impl_marmalade.cpp Moving backends code from examples/ to backends/ (step 6: update markdown documentation) 2020-10-14 14:42:00 +02:00
imgui_impl_marmalade.h Moving backends code from examples/ to backends/ (step 6: update markdown documentation) 2020-10-14 14:42:00 +02:00
imgui_impl_metal.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_metal.mm Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_opengl2.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_opengl2.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_opengl3.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_opengl3.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_osx.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_osx.mm Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_sdl.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_sdl.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_vulkan.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_vulkan.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_win32.cpp Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00
imgui_impl_win32.h Merge branch 'master' into docking 2020-10-14 14:44:03 +02:00