X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=3542af5e9ce80fbe95584265b9de65c7bcd9a483;hb=687ba7b279cdfde43c251af63db7e6bc86c37ebb;hp=a734f5abdd8069a1cb49c0e7c1469c23456c8b71;hpb=a26a969ab5b266f88479d51d7fd2bdcd4c29dc5f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a734f5abd..3542af5e9 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 11 07:24:09 CEST 2022
+Sat Jun 18 07:23:34 CEST 2022