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

2dc85e6e

Commit 2dc85e6e authored 1 year ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h

parents cf020235 d6cb3c92

Loading

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

backends/imgui_impl_opengl3.cpp 2 additions, 1 deletion

backends/imgui_impl_opengl3.cpp
backends/imgui_impl_opengl3_loader.h 4 additions, 0 deletions

backends/imgui_impl_opengl3_loader.h
docs/CHANGELOG.txt 74 additions, 48 deletions

docs/CHANGELOG.txt
imgui.cpp 180 additions, 41 deletions

imgui.cpp
imgui.h 16 additions, 9 deletions

imgui.h
imgui_demo.cpp 6 additions, 2 deletions

imgui_demo.cpp
imgui_draw.cpp 1 addition, 1 deletion

imgui_draw.cpp
imgui_internal.h 45 additions, 26 deletions

imgui_internal.h
imgui_tables.cpp 14 additions, 2 deletions

imgui_tables.cpp
imgui_widgets.cpp 2 additions, 2 deletions

imgui_widgets.cpp

with 344 additions and 132 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