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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0cd13217a..7ec08f736 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun 30 07:25:26 CEST 2019
+Sat May  9 07:23:55 CEST 2020