X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=64801e8544f67a40360a6775dc18130a6a626921;hp=746b1aa0fd1f79dd55052b21b9e070524b78cbc1;hb=b86c4e4f6e636f8b69467a43a8d4f50368601406;hpb=94cd0ba949e957e82f977834b2b190e38d3cddf6

diff --git a/.tx/merge-base b/.tx/merge-base
index 746b1aa0fd..64801e8544 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu May  3 07:23:52 CEST 2018
+Tue Nov 27 07:24:07 CET 2018