mirror of
https://github.com/ocornut/imgui.git
synced 2026-11-16 19:11:13 +00:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_opengl2.cpp # backends/imgui_impl_opengl3.cpp # imgui.cpp
This commit is contained in:
commit
fe1cee0837
26 changed files with 344 additions and 230 deletions
83
.github/workflows/build.yml
vendored
83
.github/workflows/build.yml
vendored
40
docs/FAQ.md
40
docs/FAQ.md
116
imgui.cpp
116
imgui.cpp
22
imgui.h
22
imgui.h
121
imgui_internal.h
121
imgui_internal.h
Loading…
Add table
Add a link
Reference in a new issue