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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0f5fe0e2f..a083faebf 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct 18 07:24:34 CEST 2019
+Sat Aug 22 07:23:41 CEST 2020