Merge remote-tracking branch 'official/master' into merge-upstream

VentelR · Apr 18, 2024 · f4e0d3d · f4e0d3d
2 parents 12fe851 + 950ce9f
commit f4e0d3d
Show file tree

Hide file tree

Showing 14 changed files with 451 additions and 409 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,5 +69,8 @@ $RECYCLE.BIN
 # Linux libs
 /*.so
 
+# VIM swap files.
+*.swp
+
 # SS220 EDIT
 sound/tts_cache/*