X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=3a34f2b81bec754eb41f2676daec2210cd05a534;hp=d15698b68730a588bc9947b1ab0d36958f1fe1c1;hb=0466008d0071edabe36ce8896c9090003b37277f;hpb=becfb70a12d8a13efec7ed3760533da6858916c1

diff --git a/.tx/merge-base b/.tx/merge-base
index d15698b687..3a34f2b81b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul 23 07:24:17 CEST 2018
+Sun Dec 16 07:25:19 CET 2018