X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=0d8a6db45b19542a48461ee90471685c32a7dc6e;hb=2c56f690a08c093d88532b6b8b21fa99f7de30f0;hp=4d7d48d7f8904c54792c24031b9521c120f15f29;hpb=0accece6024e8461485970785036b30a9319e5c3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 4d7d48d7f..0d8a6db45 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May  3 07:23:14 CEST 2022
+Sun Oct  2 07:24:00 CEST 2022