Transifex sync.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 41092cd207969cced37b65c1e2d544ba5069c3e5..f91678e3679ca1319d64b136fed8b8413e0050f3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 28 22:25:00 CET 2015
+Fri Jan 15 17:04:50 CET 2016