X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=f9f6285d405145c1f605e9144705f5a9e8c51958;hb=a40019904f510657ab7509122de5a3a91b6a1d83;hp=3c39db40843db478aa84893d3e51842a48290e11;hpb=dd4a23ef1c7bac69cd8f09b604b022f5f9f6fe28;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 3c39db408..f9f6285d4 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Feb 24 07:24:42 CET 2018
+Fri May 18 07:24:22 CEST 2018