X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=e21e87920aab30a85fdcffe8b91327fbfc40c4c2;hb=0dec7bcf5fa101452e59fe30b74daf24251d93e8;hp=6d3cbe531f5acfa82e643da05e53f5952c5a1ecb;hpb=1b23faa9ffebcfa148da45d0c4b2e4d96b1a3cfb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 6d3cbe531..e21e87920 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov  4 07:24:04 CET 2018
+Sat Jan 12 07:24:11 CET 2019