X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=cd53b6c9fab9227ddd1dfe27201e2535bf4f177a;hb=ae2c1407ec9a05e4f501a6604a7cce8e1030df9f;hp=ea94b9d5ddce9866b4fed3ad6f68a9d641ef1b05;hpb=fd1db0751352e8b2428a07557caa80ce6c913509;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ea94b9d5d..cd53b6c9f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 31 22:24:30 CET 2014
+Thu Aug 20 01:26:52 CEST 2015