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

b4c96355

"...dialog-system.git" did not exist on "951761214dbb58fab6faad49c8b9e4c049299614"

Commit b4c96355 authored 6 months ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp

parents 3293ef8b cb16568f

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

docs/CHANGELOG.txt 27 additions, 3 deletions

docs/CHANGELOG.txt
imgui.cpp 9 additions, 3 deletions

imgui.cpp
imgui.h 15 additions, 16 deletions

imgui.h
imgui_demo.cpp 7 additions, 2 deletions

imgui_demo.cpp
imgui_draw.cpp 1 addition, 1 deletion

imgui_draw.cpp
imgui_internal.h 2 additions, 1 deletion

imgui_internal.h
imgui_tables.cpp 1 addition, 1 deletion

imgui_tables.cpp
imgui_widgets.cpp 30 additions, 11 deletions

imgui_widgets.cpp

with 92 additions and 38 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