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

c6aa0516

Commit c6aa0516 authored 1 year ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp

parents 2b662b1a 277ae93c

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

docs/CHANGELOG.txt 16 additions, 3 deletions

docs/CHANGELOG.txt
imgui.cpp 36 additions, 23 deletions

imgui.cpp
imgui.h 7 additions, 5 deletions

imgui.h
imgui_demo.cpp 39 additions, 6 deletions

imgui_demo.cpp
imgui_draw.cpp 5 additions, 5 deletions

imgui_draw.cpp
imgui_internal.h 2 additions, 2 deletions

imgui_internal.h
imgui_tables.cpp 1 addition, 1 deletion

imgui_tables.cpp
imgui_widgets.cpp 1 addition, 1 deletion

imgui_widgets.cpp

with 107 additions and 46 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