mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-25 02:24:24 +00:00
Merge branch 'master' into docking
# Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.h
This commit is contained in:
commit
f79f0e42f7
16 changed files with 289 additions and 103 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.77
|
||||
// dear imgui, v1.78 WIP
|
||||
// (widgets code)
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue