Transifex sync.

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index 4b76d174b9875254d3238654282a5687fb413326..b0c891bbe5a7864b64d51f6a4f719d66c54d03ac 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan  7 00:02:51 CET 2015
+Mon Aug 31 21:02:59 CEST 2015