ocornut 377b864bb4 Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_dx12.cpp # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl.cpp # imgui_internal.h # imgui_widgets.cpp		2022-03-23 17:21:34 +01:00
..
example_glut_opengl2.vcxproj	Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest.	2021-06-08 17:08:49 +02:00
example_glut_opengl2.vcxproj.filters	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	2021-03-11 16:21:46 +01:00
main.cpp	Merge branch 'master' into docking	2022-03-23 17:21:34 +01:00
Makefile	CI: Fixes for OSX + explicitely request C++11.	2022-02-15 17:25:11 +01:00