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

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