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

diff --git a/.tx/merge-base b/.tx/merge-base
index 7ec08f736..188907c41 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat May  9 07:23:55 CEST 2020
+Tue Aug  4 07:23:45 CEST 2020