X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=e21e87920aab30a85fdcffe8b91327fbfc40c4c2;hb=73099042f7e12ad8584cd75b723750a2e9429665;hp=f9f6285d405145c1f605e9144705f5a9e8c51958;hpb=a40019904f510657ab7509122de5a3a91b6a1d83;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index f9f6285d4..e21e87920 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri May 18 07:24:22 CEST 2018
+Sat Jan 12 07:24:11 CET 2019