X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=1bd042c0958f89ca5907ffac23eef7410f5393f3;hb=c363ffc6ee8bbfa8571b926f06642b5d817370fe;hp=4f524c04a29d3f13b0373a3701d2b9950aead9d9;hpb=e378271f0b63f920ec1e983a5240db890be1bd26;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 4f524c04a..1bd042c09 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Apr  3 07:24:00 CEST 2022
+Fri Jun 17 07:23:08 CEST 2022