X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=9745f61361ea974460edaf8e9c90a96700d78cb1;hb=b3b87165949a2d97634b425231aeb56324cc1ce7;hp=c0ddb1d5fcf165824eec0aa7cb56ef6d8153110a;hpb=0f1ffe9c0565f1f1a0d6f58240760f227aa3ee99;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index c0ddb1d5f..9745f6136 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Feb 14 07:23:42 CET 2018
+Sun Jun  3 07:24:16 CEST 2018