X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=21290326ab5406151c6b2944741c78b0feeb08c9;hp=9bae7e1cd52108d1e3cb14b7f872ea63e693c7be;hb=3de25c766ed8b827c8a51093dacad56e0596fe48;hpb=c25812c4057b439a7e4fbf756c95378eca3bd187

diff --git a/.tx/merge-base b/.tx/merge-base
index 9bae7e1cd5..21290326ab 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu May 17 07:24:26 CEST 2018
+Sun Dec 23 07:25:23 CET 2018