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

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