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
..
build_win32.bat	Backends: OpenGL3: Embed our own minimal GL loader (amends). (#4445)	2021-08-19 16:24:59 +02:00
example_glfw_opengl3.vcxproj	Backends: OpenGL3: Embed our own minimal GL loader based on gl3w and use it in SDL/GLFW examples. (#4445)	2021-08-19 16:24:58 +02:00
example_glfw_opengl3.vcxproj.filters	Backends: OpenGL3: Embed our own minimal GL loader based on gl3w and use it in SDL/GLFW examples. (#4445)	2021-08-19 16:24:58 +02: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