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

diff --git a/.tx/merge-base b/.tx/merge-base
index ac3913de4..3a34f2b81 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 30 07:23:50 CEST 2018
+Sun Dec 16 07:25:19 CET 2018