mirror of
https://github.com/ocornut/imgui.git
synced 2026-02-06 04:20:08 +00:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_metal.mm # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_osx.mm # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt
This commit is contained in:
commit
4f692ba840
35 changed files with 634 additions and 39 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.89.5
|
||||
// dear imgui, v1.89.6 WIP
|
||||
// (demo code)
|
||||
|
||||
// Help:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue