ocornut 0b06c4b2b0 Merge branch 'master' into docking (will need further for io.AddFocusEvent) ...

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp

2021-08-19 17:25:12 +02: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 (will need further for io.AddFocusEvent)

2021-08-19 17:25:12 +02:00

Makefile

Backends: OpenGL3: Embed our own minimal GL loader (amends). (#4445)

2021-08-19 16:24:59 +02:00