Branch Sync

minecraft-linux · Nov 21, 2024 · d4c3098 · d4c3098
1 parent e86d668
commit d4c3098
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/imgui b/imgui
diff --git a/sdl3 b/sdl3
+2 −1		backends/imgui_impl_opengl3.cpp
+4 −0		docs/CHANGELOG.txt
+1 −0		imconfig.h
+15 −13		imgui.cpp
+12 −7		imgui.h
+244 −135		imgui_draw.cpp
+13 −12		imgui_internal.h
+51 −15		misc/fonts/binary_to_compressed_c.cpp
+1 −0		misc/freetype/imgui_freetype.cpp
+1 −1		cmake/sdlcpu.cmake
+12 −4		src/audio/coreaudio/SDL_coreaudio.m
+1 −0		src/joystick/controller_list.h
+6 −2		src/render/SDL_render.c
+1 −1		src/video/SDL_video.c
+4 −0		src/video/cocoa/SDL_cocoavideo.m