X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=f04ca256b222910fb9b903a026a5b463ec99c7fc;hb=a7b84ce6eec3e4fa7585193f1b01a2c6173b209d;hp=0f34767db3fa857db461a4426df74ee484a94b89;hpb=46d9653421345e35ca35ecb09084911cc86a26cd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0f34767db..f04ca256b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 14 07:24:04 CET 2022
+Thu Jan 26 07:23:35 CET 2023