X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=204f42b38cdff87571b5bd1df88bd28634cb0442;hp=aa572310535b3d19e4131e0fa907e2563a689122;hb=bf9e79eb1f1af523678927f9e221b6e9cf20bf9f;hpb=e95e817d04d9233dd9d3ce3f70f09de8379ed443

diff --git a/.tx/merge-base b/.tx/merge-base
index aa57231053..204f42b38c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 30 07:24:39 CEST 2018
+Thu May 31 07:24:27 CEST 2018