omar e2c1f0a7cd Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt

2019-06-18 23:12: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

…

main.cpp

Merge branch 'master' into docking

2019-06-18 23:12:50 +02:00