mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-31 03:20:05 +00:00
Merge branch 'master' into navigation
# Conflicts: # imgui.h
This commit is contained in:
commit
c0b366b316
5 changed files with 6 additions and 6 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.52 WIP
|
||||
// dear imgui, v1.52
|
||||
// (main code and documentation)
|
||||
|
||||
// ** EXPERIMENTAL GAMEPAD/KEYBOARD NAVIGATION BRANCH
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue