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

diff --git a/.tx/merge-base b/.tx/merge-base
index 983ae9b9b..fad0ce25a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Feb 28 07:24:50 CET 2021
+Mon Mar 15 07:23:52 CET 2021