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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0d2f0c293..cd53b6c9f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jan 11 07:37:55 CET 2015
+Thu Aug 20 01:26:52 CEST 2015