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

diff --git a/.tx/merge-base b/.tx/merge-base
index b8e6f3bc0..0f66bdb55 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May 21 07:24:27 CEST 2019
+Wed Jun 17 07:23:49 CEST 2020