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

diff --git a/.tx/merge-base b/.tx/merge-base
index 95e7fe594..c4e582b2c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun  4 07:23:50 CEST 2017
+Wed May  2 07:24:03 CEST 2018