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

diff --git a/.tx/merge-base b/.tx/merge-base
index f78e6e247..cd53b6c9f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec 21 07:51:44 CET 2014
+Thu Aug 20 01:26:52 CEST 2015