X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=9732faa399c8154aeae65fb4d56c9f8f17564368;hb=bdaceda70004085c3f44f5f961123c40864edeeb;hp=ac5115594ba2794295377369b10796c9f560bd78;hpb=d2a588188f8e5c3cdcc716ddc08d521ee26b483f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ac5115594..9732faa39 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct 16 07:24:02 CEST 2022
+Wed Feb  1 07:23:30 CET 2023