X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=47c6ecf48158b6b0bd2b3f4526a8bd1c029b26dd;hb=63259046d0c9b1a8022de19170843e25bc7eacd1;hp=3512ca5dc542939aff93cadaafcc1544cf16655e;hpb=b9998b31fc75c66b601e66241350b10ca694809f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 3512ca5dc..47c6ecf48 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep 30 07:24:04 CEST 2018
+Wed Jun 12 07:24:29 CEST 2019