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

diff --git a/.tx/merge-base b/.tx/merge-base
index ac3913de4..aa5723105 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 30 07:23:50 CEST 2018
+Wed May 30 07:24:39 CEST 2018