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

676497fe

Commit 676497fe authored 1 year ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

ac64b656 on master seemed incorrect.

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp

parents 11613013 4a814244

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

backends/imgui_impl_sdl2.cpp 5 additions, 0 deletions

backends/imgui_impl_sdl2.cpp
backends/imgui_impl_sdl2.h 1 addition, 0 deletions

backends/imgui_impl_sdl2.h
backends/imgui_impl_sdl3.cpp 5 additions, 0 deletions

backends/imgui_impl_sdl3.cpp
backends/imgui_impl_sdl3.h 1 addition, 0 deletions

backends/imgui_impl_sdl3.h
docs/CHANGELOG.txt 17 additions, 0 deletions

docs/CHANGELOG.txt
imgui.cpp 49 additions, 16 deletions

imgui.cpp
imgui.h 5 additions, 2 deletions

imgui.h
imgui_demo.cpp 42 additions, 11 deletions

imgui_demo.cpp
imgui_internal.h 3 additions, 3 deletions

imgui_internal.h
imgui_tables.cpp 2 additions, 1 deletion

imgui_tables.cpp
imgui_widgets.cpp 24 additions, 21 deletions

imgui_widgets.cpp

with 154 additions and 54 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