X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=7e1d17ed00549331b338fcc91706af126a1a51aa;hb=19aa6d657a4043b94d6b69925cd147afd5922e5a;hp=f7f21ad1f962dfeea3405965d3a7a551253ef64e;hpb=00d7b1f218f33b3ea604681e700ac2aadc12a29e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index f7f21ad1f..7e1d17ed0 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Nov 16 07:24:35 CET 2019
+Tue Jun 30 07:23:40 CEST 2020