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

diff --git a/.tx/merge-base b/.tx/merge-base
index d7ed269df..0f66bdb55 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar  8 07:24:17 CET 2019
+Wed Jun 17 07:23:49 CEST 2020