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

diff --git a/.tx/merge-base b/.tx/merge-base
index 249da9133..76b49b82a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Dec 19 07:25:06 CET 2019
+Wed Jun 24 07:23:44 CEST 2020