Skip to content
Snippets Groups Projects
Commit e391fe2e authored by ocornut's avatar ocornut
Browse files

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
parents 8b2c6dd4 6ccc561a
No related branches found
Tags v1.90.6-docking
No related merge requests found
Showing
with 227 additions and 73 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment