ocornut 34d4bc620d Merge remote-tracking branch 'origin/master' into docking ... # Conflicts: # backends/imgui_impl_opengl3.cpp		2021-04-15 19:57:52 +02: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	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	2021-03-11 16:21:46 +01:00
example_sdl_vulkan.vcxproj.filters	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	2021-03-11 16:21:46 +01:00
main.cpp	Merge remote-tracking branch 'origin/master' into docking	2021-04-15 19:57:52 +02:00