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

diff --git a/.tx/merge-base b/.tx/merge-base
index 64801e854..7ec08f736 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Nov 27 07:24:07 CET 2018
+Sat May  9 07:23:55 CEST 2020