omar a82be53407 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

2018-09-06 22:28:21 +02:00

..

example_sdl_vulkan.vcxproj

Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

2018-08-30 19:00:33 +02:00

example_sdl_vulkan.vcxproj.filters

Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

2018-08-30 19:00:33 +02:00

main.cpp

Merge branch 'docking2' into viewport_docking

2018-09-06 22:28:21 +02:00