ocornut 5d472c4895 Merge branch 'master' into docking + fixes for #3259 ... # Conflicts: # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_sdl.cpp # imgui.cpp		2020-05-25 18:32:15 +02:00
..
example_sdl_vulkan.vcxproj	Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.	2019-04-15 15:48:38 +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 + fixes for #3259	2020-05-25 18:32:15 +02:00