You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
3 years ago
..
example_apple_opengl2.xcodeproj Backends: OpenGL3: Embed our own minimal GL loader (amends). (#4445) 3 years ago
main.mm Merge branch 'features/backends_context' into docking 3 years ago