X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=72a93f227ae58c764c7b5c6d69941b098ecc706c;hb=77938f12f36161281206b18b6361ab209c1d1a2e;hp=5a5c28047009e11e9d1d1e1ccd3d041531dc59e4;hpb=23dd6f2c565d74ee081b453d5666a73c7ed3f0a4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 5a5c28047..72a93f227 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul  9 07:24:10 CEST 2018
+Sat Nov  3 07:24:08 CET 2018