X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=d39a1e537b98f32267e63dd8d0d72b898aac3412;hb=cec1279555390bc9d77cb3088f7d3499477b249f;hp=ddc648da2a9791ee5b51c1e18f061192c4e8adff;hpb=d10c7bd1a40c18aa6960a6e0f25dfc5a2e113137;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ddc648da2..d39a1e537 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun May 16 07:24:53 CEST 2021
+Sat Jun  5 07:23:46 CEST 2021