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

ce0d0ac8

Commit ce0d0ac8 authored 1 year ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	imgui.cpp

parents 6695006b b81bd7ed

No related branches found

Tags v1.90-docking

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

docs/CHANGELOG.txt 28 additions, 25 deletions

docs/CHANGELOG.txt
docs/FAQ.md 0 additions, 5 deletions

docs/FAQ.md
docs/README.md 2 additions, 2 deletions

docs/README.md
imgui.cpp 22 additions, 6 deletions

imgui.cpp
imgui.h 16 additions, 10 deletions

imgui.h
imgui_demo.cpp 26 additions, 12 deletions

imgui_demo.cpp
imgui_draw.cpp 11 additions, 4 deletions

imgui_draw.cpp
imgui_internal.h 1 addition, 1 deletion

imgui_internal.h
imgui_tables.cpp 1 addition, 1 deletion

imgui_tables.cpp
imgui_widgets.cpp 4 additions, 9 deletions

imgui_widgets.cpp
misc/freetype/imgui_freetype.cpp 18 additions, 12 deletions

misc/freetype/imgui_freetype.cpp

with 129 additions and 87 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