Update default video settings

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index cd219015e0f591882df5a91ee121bec4d0ddfd32..ec17f2cf065289250fea65eb9600e8e87d4c3178 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Apr 10 07:23:20 CEST 2021
+Wed Apr 10 07:22:59 AM CEST 2024