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 df8406c81c146fcc38b993717f639c11113f66c4..071bbeb694d1e06d323405b0584f40f124642622 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 10:53:40 CEST 2013
+Sat Jan  3 09:34:55 CET 2015