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
..
example_apple_opengl2.xcodeproj	Moving backends code from examples/ to backends/ (step 3: fixing project files)	2020-10-14 14:41:40 +02:00
main.mm	Merge branch 'master' into docking	2020-10-14 14:44:03 +02:00