X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=a197e3dc0066cd81b37f42d3bacaa2cd8382cd3f;hp=94ecb457b816678a95db4e9131c3c98dcc6f64d9;hpb=fc1875c59f5b196a0f06693eabb322b849b07a43;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 94ecb457b..0f66bdb55 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Apr 28 07:25:31 CEST 2019
+Wed Jun 17 07:23:49 CEST 2020