From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 13 Oct 2015 19:10:01 +0000 (+0200)
Subject: Dummy transifex sync.
X-Git-Tag: xonotic-v0.8.2~1830
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8af0e470d82029e4ea8cf98b55492e110f8ef87;p=xonotic%2Fxonotic-data.pk3dir.git

Dummy transifex sync.
---

diff --git a/.tx/merge-base b/.tx/merge-base
index b0c891bbe..f02ef5eea 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Aug 31 21:02:59 CEST 2015
+Tue Oct 13 21:09:53 CEST 2015