X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=d487e5941b0a45c10644b0895fdbae5695c6164c;hb=9c0a74df159e78293a10e2fb71465ef246d0c62f;hp=a734f5abdd8069a1cb49c0e7c1469c23456c8b71;hpb=a26a969ab5b266f88479d51d7fd2bdcd4c29dc5f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a734f5abd..d487e5941 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 11 07:24:09 CEST 2022
+Wed Aug 10 07:23:12 CEST 2022