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

diff --git a/.tx/merge-base b/.tx/merge-base
index af8d9b326..fad0ce25a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Nov  5 07:23:37 CET 2020
+Mon Mar 15 07:23:52 CET 2021