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

diff --git a/.tx/merge-base b/.tx/merge-base
index dbb4e7580..fad0ce25a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Nov 25 07:23:42 CET 2020
+Mon Mar 15 07:23:52 CET 2021