X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=b2a68a812ec2b2601a6f7f142acb0c03ddd1b4d3;hb=9e05a125bbad5142ad36b2022d49854e1940c2b3;hp=b87595c010702b4ac59baf373531dbc6dfc21b36;hpb=5512d9b98b3e7ca020204c0552f3566b857111c6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index b87595c01..b2a68a812 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug 13 07:23:21 CEST 2022
+Tue Aug 16 07:23:23 CEST 2022