From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 4 Oct 2013 11:03:20 +0000 (+0200)
Subject: Oops. Why wasn't merge-base updated...
X-Git-Tag: xonotic-v0.8.0~306
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9120a47f091b6e2d0f5bb48914443b6dbd6c417d;p=xonotic%2Fxonotic-data.pk3dir.git

Oops. Why wasn't merge-base updated...
---

diff --git a/.tx/merge-base b/.tx/merge-base
index 1defbff27..fa97f6f95 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 21:26:35 CEST 2013
+Fri Oct  4 13:03:13 CEST 2013