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

diff --git a/.tx/merge-base b/.tx/merge-base
index b85f4aba7..7ec08f736 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Dec 29 07:24:08 CET 2018
+Sat May  9 07:23:55 CEST 2020