X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=fad0ce25a6994c5ec7d6c716a53684a2c1b058af;hb=5d7aebf30f5605ecef1bfa299e448eb07fba3ea8;hp=de2591c13542d3ce6b0e2bb48af7d2e7ffb6a63a;hpb=873f1b3ef177d3b290982be4adb3707482b8c6fc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index de2591c13..fad0ce25a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct 18 07:24:53 CEST 2020
+Mon Mar 15 07:23:52 CET 2021