X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a083faebfdf1ae65fde120303c463f71a7dee520;hb=1bedb9300b23b98c65d2c7babc3e4d013f7c2e17;hp=1bafc5c83e378fd9504d6b661cb2217cbdb2c3a3;hpb=78c5e1304a6385db0538e7cd917f6752e697d5f9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 1bafc5c83..a083faebf 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Feb 17 07:24:21 CET 2020
+Sat Aug 22 07:23:41 CEST 2020