All in all it's just a-nother transifex sync.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index fa97f6f95163f1e6c766bf3fda1093ccb3d03b89..2a874db8c884da4033b16d4ee10049da3a62296f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 13:03:13 CEST 2013
+Wed Dec 31 07:34:34 CET 2014