mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +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
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.92.1
|
||||
// dear imgui, v1.92.2 WIP
|
||||
// (demo code)
|
||||
|
||||
// Help:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue