omar 575df6f192 Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_internal.h

2019-09-17 16:35:50 +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

2019-09-17 16:35:50 +02:00