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 83100d90ea3c18789399f5a86f38b4bede3be14a..071bbeb694d1e06d323405b0584f40f124642622 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Feb 14 12:12:04 CET 2014
+Sat Jan  3 09:34:55 CET 2015