omar f94af2f5c5 Merge branch 'viewport' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_draw.cpp

2019-01-20 22:13:35 +01: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 'viewport' into docking

2019-01-20 22:13:35 +01:00