mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-31 03:20:05 +00:00
Merge branch 'master' into docking
# Conflicts: # imgui.cpp # imgui.h # imgui_internal.h
This commit is contained in:
commit
222dd775fc
10 changed files with 83 additions and 56 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.90.7
|
||||
// dear imgui, v1.90.8 WIP
|
||||
// (drawing and font code)
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue