From 28dd8d7efdb6c66bddb18d1f6f48ddf2b5249d28 Mon Sep 17 00:00:00 2001 From: omar Date: Wed, 27 Nov 2019 19:27:44 +0100 Subject: [PATCH] Docking: Fixed various conflicts not properly resolved on 813e0c1 New git client confusion. --- docs/CHANGELOG.txt | 4 ---- examples/imgui_impl_dx9.h | 4 ---- examples/imgui_impl_metal.mm | 6 +----- examples/imgui_impl_vulkan.cpp | 6 +----- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index c765a54d..4deca1ec 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -30,7 +30,6 @@ HOW TO UPDATE? ----------------------------------------------------------------------- -<<<<<<< HEAD DOCKING BRANCH (In Progress) ----------------------------------------------------------------------- @@ -100,10 +99,7 @@ Other changes: ----------------------------------------------------------------------- - VERSION 1.74 WIP (In Progress) -======= VERSION 1.74 (Released 2019-11-25) ->>>>>>> master ----------------------------------------------------------------------- Breaking Changes: diff --git a/examples/imgui_impl_dx9.h b/examples/imgui_impl_dx9.h index ccbd0eeb..339645e3 100644 --- a/examples/imgui_impl_dx9.h +++ b/examples/imgui_impl_dx9.h @@ -3,12 +3,8 @@ // Implemented features: // [X] Renderer: User texture binding. Use 'LPDIRECT3DTEXTURE9' as ImTextureID. Read the FAQ about ImTextureID! -<<<<<<< HEAD // [X] Renderer: Multi-viewport support. Enable with 'io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable'. -// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bits indices. -======= // [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices. ->>>>>>> master // You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. // If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. diff --git a/examples/imgui_impl_metal.mm b/examples/imgui_impl_metal.mm index 5bf60bea..10814b46 100644 --- a/examples/imgui_impl_metal.mm +++ b/examples/imgui_impl_metal.mm @@ -3,13 +3,9 @@ // Implemented features: // [X] Renderer: User texture binding. Use 'MTLTexture' as ImTextureID. Read the FAQ about ImTextureID! -<<<<<<< HEAD -// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bits indices. +// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices. // Missing features: // [ ] Renderer: Multi-viewport / platform windows. -======= -// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices. ->>>>>>> master // You can copy and use unmodified imgui_impl_* files in your project. See main.cpp for an example of using this. // If you are new to dear imgui, read examples/README.txt and read the documentation at the top of imgui.cpp. diff --git a/examples/imgui_impl_vulkan.cpp b/examples/imgui_impl_vulkan.cpp index 3e726bb7..a503703e 100644 --- a/examples/imgui_impl_vulkan.cpp +++ b/examples/imgui_impl_vulkan.cpp @@ -2,12 +2,8 @@ // This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..) // Implemented features: -<<<<<<< HEAD -// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bits indices. -// [x] Platform: Multi-viewport / platform windows. With issues (flickering when creating a new viewport). -======= // [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices. ->>>>>>> master +// [x] Platform: Multi-viewport / platform windows. With issues (flickering when creating a new viewport). // Missing features: // [ ] Renderer: User texture binding. Changes of ImTextureID aren't supported by this binding! See https://github.com/ocornut/imgui/pull/914