X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=2fbd14b26ff6895617191f17760731e77305dcdb;hp=573a066e31bef33771349987f35204060b3c1804;hb=d5d61332b0013a779f64d068804892843bb78d89;hpb=164d3e92e91b91d8f6960ee6442f4906dffb418d

diff --git a/.tx/merge-base b/.tx/merge-base
index 573a066e31..2fbd14b26f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Apr 29 07:23:51 CEST 2018
+Fri Nov  9 07:24:16 CET 2018