X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=9bae7e1cd52108d1e3cb14b7f872ea63e693c7be;hb=c85cc819d541ebcb396263ec5228399a9a4d788c;hp=431dcbe974dc57728a788a275a92bcbc985444ca;hpb=1852dd0b6c285f4c8d44e08efb6c9ea0709658eb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 431dcbe97..9bae7e1cd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Mar 17 07:23:46 CET 2018
+Thu May 17 07:24:26 CEST 2018