X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=97d57c7b2c5c986fd0e535697c5d38e2d0c0e5ef;hb=d14f3f5afd18ad9cb251e487f1ca7632d84bf48b;hp=ee592a047de4fe004ded78c6c74303679937a275;hpb=34e754a5c19b29e5db5f974b36bd774e0350cadd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ee592a047..97d57c7b2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Nov  8 07:23:14 CET 2021
+Fri Jan  7 07:23:03 CET 2022