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

diff --git a/.tx/merge-base b/.tx/merge-base
index af99f0876..97d57c7b2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 12 07:23:45 CEST 2021
+Fri Jan  7 07:23:03 CET 2022