ocornut 8567a4cca3 Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui_demo.cpp
#	imgui_internal.h

2022-01-17 18:19:20 +01:00

..

build_win32.bat

Added build/ to gitignore (#3027), Examples: SDL2: Link with shell32.lib required by SDL2main.lib since SDL 2.0.12. [#3988, #3884] + added batch file for SDL+Vulkan.

2021-03-31 16:19:44 +02:00

example_sdl_vulkan.vcxproj

Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments.

2021-06-08 17:10:24 +02:00

example_sdl_vulkan.vcxproj.filters

Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest.

2021-06-08 17:08:49 +02:00

main.cpp

Merge branch 'master' into docking

2022-01-17 18:19:20 +01:00