omar 172570acae Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp # imgui.h		2018-03-20 22:14:34 +01:00
..
main.cpp	Merge branch 'master' into viewport	2018-03-20 22:14:34 +01:00
sdl_vulkan_example.vcxproj	Examples: Using draw_data->DisplaySize, followup to c50198debe. Fix Vulkan secondary viewport rendering. SDL+Vulkan: Matched changes. Fix vcprojs. (#1542, #1042)	2018-03-13 23:07:12 +01:00
sdl_vulkan_example.vcxproj.filters	Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367)	2018-02-21 22:41:04 +01:00