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

diff --git a/.tx/merge-base b/.tx/merge-base
index 41063ec71..b2a68a812 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat May 28 07:23:08 CEST 2022
+Tue Aug 16 07:23:23 CEST 2022