X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=40970e2c1af4ac7089c854d1bcf6c909e6d3bbac;hb=1b9c4091ae485ecc1cfeb02445db5183299f80a3;hp=b0c891bbe5a7864b64d51f6a4f719d66c54d03ac;hpb=688276421e89bb47394a765b2b242f81da1d4228;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index b0c891bbe..40970e2c1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Aug 31 21:02:59 CEST 2015
+Tue Oct 13 21:13:27 CEST 2015