X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=a197e3dc0066cd81b37f42d3bacaa2cd8382cd3f;hp=27d0db5ace70b7062d64d3138ea86384f87ba81f;hpb=af43b181a15f348a4de2045b716ebc7765ce8f9f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 27d0db5ac..0f66bdb55 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jul 30 07:24:47 CEST 2019
+Wed Jun 17 07:23:49 CEST 2020