X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=f8537985646d68b29f07e4c0d600646f13599fd7;hb=9c2f5ef44b8707cfa55f30da39c9d90b81c60738;hp=15ebc5061f6a12174f1072399a95408cf9aa3567;hpb=5973c51070c8a9790eb66e3913cd5958d183efb6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 15ebc5061..f85379856 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Feb  3 07:23:37 CET 2021
+Fri Apr  9 14:55:12 CEST 2021