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 a517ba03f14a4147d472872428ddb4e51b1b68fe..2a874db8c884da4033b16d4ee10049da3a62296f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Wed Dec 31 07:34:34 CET 2014