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

diff --git a/.tx/merge-base b/.tx/merge-base
index a517ba03f..cd53b6c9f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Thu Aug 20 01:26:52 CEST 2015