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

diff --git a/.tx/merge-base b/.tx/merge-base
index 6d3cbe531f..2fbd14b26f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov  4 07:24:04 CET 2018
+Fri Nov  9 07:24:16 CET 2018