Transifex sync.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 2a874db8c884da4033b16d4ee10049da3a62296f..ea94b9d5ddce9866b4fed3ad6f68a9d641ef1b05 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 31 07:34:34 CET 2014
+Wed Dec 31 22:24:30 CET 2014