X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=188907c41507edd6dce4c81d5a790c16d87d3371;hb=5be3a619774b8c54a1da7165aa519ab503087c35;hp=76b17ee0d96cbfc3d0e9f6020d21617e2e0f24b3;hpb=bf078048717d708ea88d839f80e30bdc7907d600;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 76b17ee0d..188907c41 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 13 07:23:38 CEST 2020
+Tue Aug  4 07:23:45 CEST 2020