X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=9745f61361ea974460edaf8e9c90a96700d78cb1;hb=0fb3d509292b040b5a1a1844a81d7615ac2ffe46;hp=0668a3f8b1dab47f1a580c2c41134a5c1ed5cedb;hpb=48026952b44d6e1b2172fb9cd68b95caa3f0f968;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0668a3f8b..9745f6136 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri May 11 07:24:25 CEST 2018
+Sun Jun  3 07:24:16 CEST 2018