X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=8f3fd420949a286c6dd95a9806bb853b14a1493e;hb=d2b0f12cb08fe3d1e59d3c9514546c4858cf9012;hp=cad03ae669ccf13942c8bfdb86db840a17871dd4;hpb=65b42258b7ca1edb2dfd2eaab05a7d65f2656c17;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index cad03ae66..8f3fd4209 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Apr  8 07:23:09 CEST 2022
+Tue Apr 12 07:23:16 CEST 2022