Branch Sync

minecraft-linux · Jun 29, 2024 · 67ab9dc · 67ab9dc
1 parent c5d12c9
commit 67ab9dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/game-window b/game-window
diff --git a/imgui b/imgui
diff --git a/mcpelauncher-client b/mcpelauncher-client
diff --git a/sdl3 b/sdl3
+1 −0		.gitignore
+8 −7		backends/imgui_impl_glfw.cpp
+3 −0		backends/imgui_impl_opengl2.cpp
+3 −0		backends/imgui_impl_opengl3.cpp
+5 −1		backends/imgui_impl_osx.mm
+9 −8		backends/imgui_impl_sdl2.cpp
+22 −11		backends/imgui_impl_sdl3.cpp
+1 −1		backends/imgui_impl_vulkan.h
+3 −1		backends/imgui_impl_win32.cpp
+48 −3		docs/CHANGELOG.txt
+1 −1		examples/example_glfw_vulkan/main.cpp
+1 −1		examples/example_sdl2_vulkan/main.cpp
+112 −43		imgui.cpp
+39 −18		imgui.h
+28 −12		imgui_demo.cpp
+18 −12		imgui_draw.cpp
+22 −9		imgui_internal.h
+60 −34		imgui_widgets.cpp