mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Merge branch 'master' into navigation
# Conflicts: # imgui.cpp # imgui.h
This commit is contained in:
commit
c4e6d622c1
6 changed files with 34 additions and 22 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.53
|
||||
// dear imgui, v1.54 WIP
|
||||
// (drawing and font code)
|
||||
|
||||
// Contains implementation for
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue