X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=c4e582b2cb2d2f7081713dd7e9ef017568faa6a0;hb=34e6959615f700a9d6ffe5dda92f0892f0cb23ec;hp=a7a8f8175b3b5abfc747eed09b3a9f9610e742f3;hpb=63841ddfb9349787f6380b9e9e2606e6d7ed9eb6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index a7a8f8175..c4e582b2c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri May 26 07:23:54 CEST 2017
+Wed May  2 07:24:03 CEST 2018