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

6d948ab4

Commit 6d948ab4 authored 10 months ago by ocornut

Downloads
- Plain Diff

Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp

parents fdc084f5 6f7b5d0e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

docs/CHANGELOG.txt 18 additions, 1 deletion

docs/CHANGELOG.txt
examples/example_sdl3_sdlrenderer3/main.cpp 1 addition, 1 deletion

examples/example_sdl3_sdlrenderer3/main.cpp
imgui.cpp 10 additions, 4 deletions

imgui.cpp
imgui.h 34 additions, 27 deletions

imgui.h
imgui_demo.cpp 19 additions, 14 deletions

imgui_demo.cpp
imgui_draw.cpp 1 addition, 1 deletion

imgui_draw.cpp
imgui_internal.h 43 additions, 38 deletions

imgui_internal.h
imgui_tables.cpp 1 addition, 1 deletion

imgui_tables.cpp
imgui_widgets.cpp 33 additions, 14 deletions

imgui_widgets.cpp

with 160 additions and 101 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