Transifex merge. Now with 100% Russian!

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

diff --git a/.tx/merge-base b/.tx/merge-base
index ea94b9d5ddce9866b4fed3ad6f68a9d641ef1b05..071bbeb694d1e06d323405b0584f40f124642622 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 31 22:24:30 CET 2014
+Sat Jan  3 09:34:55 CET 2015