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

diff --git a/.tx/merge-base b/.tx/merge-base
index ac3913de4..64801e854 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 30 07:23:50 CEST 2018
+Tue Nov 27 07:24:07 CET 2018