X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=547040790313863da4a7cfb44aa97d094f626ca5;hb=d14e47f26d06920b0175759f97b6fa8dd751f5c8;hp=f0f5a1f26f1966b0dc2e70a627f46e4c19167f5a;hpb=23207c76093c01b776d43f8c6a1fa650a7d39e9b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index f0f5a1f26..1f86186fc 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Nov 22 07:24:37 CET 2019
+Sat Jul 11 07:23:51 CEST 2020