X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=99d127cbd61dbcc4cf809204e97c02d821d74f9e;hb=dfeb73bcd0f3a285d34f0bf85ae16762ff97e890;hp=a90598bb3f2da203bf2266d3e7ec0b9091d9351f;hpb=af10cd512a39605d9721ad0347ff9734ba56e6d5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a90598bb3..99d127cbd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 14 07:24:53 CET 2020
+Sat Jun  6 07:23:41 CEST 2020