X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=64801e8544f67a40360a6775dc18130a6a626921;hp=ca7140deb4f39043ced90c760624d498c0f1b2a1;hb=76dd66af43f0f01131d019c3a8dacfe35a6f6a18;hpb=4096ab0591cbd7fac803e022375cd3c221511d8b

diff --git a/.tx/merge-base b/.tx/merge-base
index ca7140deb4..64801e8544 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun 20 07:24:25 CEST 2018
+Tue Nov 27 07:24:07 CET 2018