Merge remote-tracking branch 'origin/master' into chris-dev

update
2024-12-08 20:34:42 -06:00 · 2024-12-08 21:28:28 -05:00
3 changed files with 1 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
 # Godot 4+ specific ignores
 .godot/
-/android/
+/android/
--- a/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll
+++ b/addons/godotsteam/win64/~libgodotsteam.windows.template_debug.x86_64.dll
--- a/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll
+++ b/godot-jolt/windows/~godot-jolt_windows-x64_editor.dll
Author	SHA1	Message	Date
Chris Bell	a0a288ae22	Merge remote-tracking branch 'origin/master' into chris-dev	2024-12-08 20:34:42 -06:00
WiseNoodle	616d2746f3	update	2024-12-08 21:28:28 -05:00