X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=20fcea5d94091b77382bbb958adc376e9246abab;hb=959ef8d48186515e98dbe21edcd35c9918dd37a1;hp=d487e5941b0a45c10644b0895fdbae5695c6164c;hpb=0db0001bd383b6d57f9583120d0868feb70290e7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index d487e5941..20fcea5d9 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Aug 10 07:23:12 CEST 2022
+Thu Aug 25 07:23:24 CEST 2022