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

139e99ca

Commit 139e99ca authored 8 months ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp

parents 6df1a06f 8199457a

No related branches found

Tags v1.91.0-docking

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

docs/CHANGELOG.txt 59 additions, 51 deletions

docs/CHANGELOG.txt
examples/example_android_opengl3/android/app/src/main/AndroidManifest.xml 1 addition, 1 deletion

..._android_opengl3/android/app/src/main/AndroidManifest.xml
imgui.cpp 10 additions, 4 deletions

imgui.cpp
imgui.h 11 additions, 11 deletions

imgui.h
imgui_demo.cpp 54 additions, 45 deletions

imgui_demo.cpp
imgui_draw.cpp 1 addition, 1 deletion

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 1 addition, 1 deletion

imgui_widgets.cpp

with 139 additions and 116 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