-
- Downloads
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_sdl3.cpp
Showing
- backends/imgui_impl_allegro5.cpp 2 additions, 2 deletionsbackends/imgui_impl_allegro5.cpp
- backends/imgui_impl_sdl3.cpp 2 additions, 1 deletionbackends/imgui_impl_sdl3.cpp
- backends/imgui_impl_sdlrenderer3.cpp 26 additions, 3 deletionsbackends/imgui_impl_sdlrenderer3.cpp
- docs/CHANGELOG.txt 18 additions, 5 deletionsdocs/CHANGELOG.txt
- examples/example_sdl3_opengl3/main.cpp 0 additions, 3 deletionsexamples/example_sdl3_opengl3/main.cpp
- examples/example_sdl3_sdlrenderer3/main.cpp 0 additions, 3 deletionsexamples/example_sdl3_sdlrenderer3/main.cpp
- imgui.cpp 3 additions, 3 deletionsimgui.cpp
- imgui.h 5 additions, 4 deletionsimgui.h
- imgui_demo.cpp 6 additions, 7 deletionsimgui_demo.cpp
- imgui_draw.cpp 1 addition, 1 deletionimgui_draw.cpp
- imgui_internal.h 1 addition, 1 deletionimgui_internal.h
- imgui_tables.cpp 1 addition, 1 deletionimgui_tables.cpp
- imgui_widgets.cpp 24 additions, 21 deletionsimgui_widgets.cpp
- misc/freetype/imgui_freetype.cpp 1 addition, 1 deletionmisc/freetype/imgui_freetype.cpp
Loading
Please register or sign in to comment