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

diff --git a/.tx/merge-base b/.tx/merge-base
index f78e6e247..40970e2c1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec 21 07:51:44 CET 2014
+Tue Oct 13 21:13:27 CEST 2015