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

368123ab

Commit 368123ab authored 5 months ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui_draw.cpp

parents d9f829dd f401021d

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

backends/imgui_impl_metal.mm 1 addition, 8 deletions

backends/imgui_impl_metal.mm
backends/imgui_impl_osx.mm 1 addition, 8 deletions

backends/imgui_impl_osx.mm
backends/imgui_impl_vulkan.cpp 3 additions, 3 deletions

backends/imgui_impl_vulkan.cpp
docs/CHANGELOG.txt 30 additions, 22 deletions

docs/CHANGELOG.txt
imgui.cpp 3 additions, 1 deletion

imgui.cpp
imgui.h 7 additions, 5 deletions

imgui.h
imgui_demo.cpp 1 addition, 1 deletion

imgui_demo.cpp
imgui_draw.cpp 16 additions, 11 deletions

imgui_draw.cpp
imgui_internal.h 10 additions, 1 deletion

imgui_internal.h
imgui_tables.cpp 2 additions, 1 deletion

imgui_tables.cpp
imgui_widgets.cpp 2 additions, 1 deletion

imgui_widgets.cpp
misc/freetype/imgui_freetype.cpp 3 additions, 2 deletions

misc/freetype/imgui_freetype.cpp

with 79 additions and 64 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