X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=7ec08f73661d5c1504e116996cedbfb539dbeeb0;hp=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=7be0877c0f6578563a106a541357647b888ea1da;hpb=36b1e07cbd318b9ef5262fb5951244f16ef297c8

diff --git a/.tx/merge-base b/.tx/merge-base
index 67a023d4c..7ec08f736 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Sep 12 07:24:50 CEST 2019
+Sat May  9 07:23:55 CEST 2020