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

diff --git a/.tx/merge-base b/.tx/merge-base
index 6a5ba5668..f9f6285d4 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jun  2 07:23:54 CEST 2017
+Fri May 18 07:24:22 CEST 2018