ocornut 36c331ff74 Merge branch 'master' into docking ... # Conflicts: # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp # imgui.cpp # imgui_internal.h		2020-09-02 12:47:07 +02:00
..
example_sdl_vulkan.vcxproj	Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)"	2020-08-10 11:33:59 +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 'master' into docking	2020-09-02 12:47:07 +02:00