commit a82be53407a304ea0894133df940ce806f3db92a
author omar <omarcornut@gmail.com> Thu Sep 06 22:25:42 2018 +0200
committer omar <omarcornut@gmail.com> Thu Sep 06 22:28:21 2018 +0200
tree 250aa19c83d0bb2a80646284befd889ffec22c31
parent b974fffea033149ffe53b4107f632b4ebb95b708
parent 49533bc86eced2a48094b9fd7eb1e1dd72090b37

Merge branch 'docking2' into viewport_docking

# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/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
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h