X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=b2a68a812ec2b2601a6f7f142acb0c03ddd1b4d3;hb=9e05a125bbad5142ad36b2022d49854e1940c2b3;hp=d487e5941b0a45c10644b0895fdbae5695c6164c;hpb=07bbfa46e816c94bd63a2af533c4a2a31e0078a5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index d487e5941..b2a68a812 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Aug 10 07:23:12 CEST 2022
+Tue Aug 16 07:23:23 CEST 2022