Merge remote-tracking branch 'upstream/master' into test-staging

2026-04-17 09:40:52 -07:00
parent f2073332e2 ddbecc2bad
commit 4f2098189b
124 changed files with 16282 additions and 16856 deletions
@@ -97,6 +97,10 @@ local.properties
 .project
 .cproject

+# vcpkg integration
+/vcpkg/
+/vcpkg-ports/
+

 # ==================
 #