X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=b7f16040c4f3f2551155e7e9b741e88a65a69b8e;hb=87cc9ed8d3385e218818f2e5d5a2e6f59659c407;hp=f0e1fd1638a3d278db6d31352448b71697b1f6d1;hpb=0509e23eca561ba75cc1c4b1b892ecbb404b6f8c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index f0e1fd163..b7f16040c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 15 07:24:20 CEST 2019
+Sat Nov  9 07:24:26 CET 2019