Update default video settings

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

diff --git a/.tx/merge-base b/.tx/merge-base
index bc9c40b86050bf58d33cb7a93927bf39e8fe4f57..ec17f2cf065289250fea65eb9600e8e87d4c3178 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jun 13 07:24:36 CEST 2019
+Wed Apr 10 07:22:59 AM CEST 2024