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

diff --git a/.tx/merge-base b/.tx/merge-base
index cd53b6c9f..40970e2c1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 01:26:52 CEST 2015
+Tue Oct 13 21:13:27 CEST 2015