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

diff --git a/.tx/merge-base b/.tx/merge-base
index e21e87920..7ec08f736 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 12 07:24:11 CET 2019
+Sat May  9 07:23:55 CEST 2020