Support gametype and not_gametype fields on QL maps

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

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