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

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