X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=76b49b82aad24632754e43d1fa3074656971566d;hb=b7f01d62a12d363e2ad28090b22c208694826ec1;hp=0b4e832800ada01d1fc9e633af055ce5716806eb;hpb=f87b9a379f2418ff37032302ac094038ae4a970f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0b4e83280..76b49b82a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jun  5 07:23:39 CEST 2020
+Wed Jun 24 07:23:44 CEST 2020