X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a3b74888d22f294a4ece909a299937c62cb2d575;hb=8b12ff5889a7a23a5ddb063a81c06db599642f2d;hp=1c018249abc10304c75f02d824ad11f556c89d1c;hpb=bfa3addf92e4eaabf10ed919dfc0c69d9a583e33;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 1c018249a..a3b74888d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar 19 07:24:30 CET 2021
+Sun Apr  4 07:24:52 CEST 2021