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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0e3c61613..7ec08f736 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 12 07:24:40 CEST 2019
+Sat May  9 07:23:55 CEST 2020