More transifex sync.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index fd366f8ebd6aadbf77fcdc0748db5b744e8f3518..f702dee7cf323902e6e705e70421d07a106403ed 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 13:06:47 CEST 2013
+Tue Dec 30 12:43:17 CET 2014