X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=ea348040dc5873f71545159c20755a479a1f80d6;hp=d03c707af970540f1b97e8909029f4fb086f3843;hb=39bdf0883c77015b39b7ddca7c9b798e8ec2a6ec;hpb=edf01df130d0d1877461561178b8833a9ab6051c

diff --git a/.tx/merge-base b/.tx/merge-base
index d03c707af9..ea348040dc 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May 10 21:52:13 CEST 2016
+Sun Feb  4 07:24:40 CET 2018