Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

Imgui
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

1db579d4

Commit 1db579d4 authored 1 year ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

parents 085781f5 231cbee0

No related branches found

Tags v1.90.5-docking

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

backends/imgui_impl_wgpu.h 1 addition, 1 deletion

backends/imgui_impl_wgpu.h
docs/CHANGELOG.txt 25 additions, 3 deletions

docs/CHANGELOG.txt
imgui.cpp 86 additions, 61 deletions

imgui.cpp
imgui.h 18 additions, 10 deletions

imgui.h
imgui_demo.cpp 7 additions, 3 deletions

imgui_demo.cpp
imgui_draw.cpp 4 additions, 3 deletions

imgui_draw.cpp
imgui_internal.h 3 additions, 1 deletion

imgui_internal.h
imgui_tables.cpp 24 additions, 7 deletions

imgui_tables.cpp
imgui_widgets.cpp 12 additions, 7 deletions

imgui_widgets.cpp

with 180 additions and 96 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment